[evolution] Updated Galician translations



commit 5f010acb118a882d208b0eabf3c2eeca18e10f49
Author: Fran Dieguez <fran dieguez mabishu com>
Date:   Mon Jan 12 01:11:35 2015 +0100

    Updated Galician translations

 po/gl.po | 9113 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 5625 insertions(+), 3488 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 487b22a..373c1c1 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,15 +12,14 @@
 # Antón Méixome <meixome certima net>, 2010.
 # 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.
-#: ../shell/main.c:554
+# Fran Dieguez <frandieguez gnome org>, 2012, 2013, 2014, 2015.
+#: ../shell/main.c:503
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolut";
-"ion&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2014-03-24 15:04+0000\n"
-"PO-Revision-Date: 2014-03-24 16:09+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-01-12 00:41+0100\n"
+"PO-Revision-Date: 2015-01-12 01:11+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: gnome-l10n-gl gnome org\n"
 "Language: gl\n"
@@ -133,24 +132,28 @@ msgid "Unable to perform search."
 msgstr "Non é posíbel realizar a busca."
 
 #: ../addressbook/addressbook.error.xml.h:20
+msgid "Failed to refresh address book '{0}'"
+msgstr "Produciuse un fallo ao actualizar a axenda de enderezos '{0}'"
+
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "Desexa gardar os cambios?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Fixo modificacións neste contacto. Desexa gardar esas modificacións?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "Re_xeitar"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
 msgstr "Non é posíbel mover o contacto."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -158,36 +161,36 @@ msgstr ""
 "Está tentando mover un contacto dunha axenda de enderezos a outra pero non é "
 "posíbel retiralo da fonte. No seu lugar desexa gardar unha copia?"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "A imaxe que seleccionou é grande. Desexa redimensionala e gardala?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "_Redimensionar"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "_Usar tal como está"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "Non gar_dar"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Non é posíbel gardar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Produciuse un erro ao gardar {0} en {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Address '{0}' already exists."
 msgstr "O enderezo «{0}» xa existe."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -195,30 +198,30 @@ msgstr ""
 "Xa existe un contacto con este enderezo. Desexa, de todas formas, engadir "
 "unha tarxeta nova co mesmo enderezo?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-merging.c:626
+#: ../addressbook/gui/widgets/eab-contact-merging.c:723
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
-#: ../e-util/e-mail-signature-manager.c:327
-#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
-#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
-#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../e-util/e-mail-signature-manager.c:326
+#: ../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:53 ../modules/mail/em-composer-prefs.c:397
 #: ../plugins/attachment-reminder/attachment-reminder.c:557
-#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
 msgid "_Add"
 msgstr "Eng_adir"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "Algúns enderezos xa existen nesta lista de contactos."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -226,19 +229,19 @@ msgstr ""
 "Está tentando engadir enderezos que xa son parte desta lista. Desexa "
 "engadilo de todas as formas?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "Omitir duplicados"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "Engadir sen duplicados"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "List '{0}' is already in this contact list."
 msgstr "A lista «{0}» xa está na lista de contactos."
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
@@ -246,21 +249,21 @@ msgstr ""
 "Xa existe a lista de contactos «{0}» nesta lista de contactos. Desexa "
 "engadila de todas as formas?"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1250
 msgid "Failed to delete contact"
 msgstr "Produciuse un erro ao eliminar o contacto"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Non ten permisos para eliminar contactos desta axenda de enderezos."
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "Non é posíbel engadir un contacto novo"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:45
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -268,13 +271,13 @@ msgstr ""
 "«{0}» é unha axenda de enderezos só de lectura e non é posíbel modificala. "
 "Seleccione unha axenda de enderezos diferente na barra lateral en Contactos."
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "Cannot save a contact, address book is still opening"
 msgstr ""
 "Non é posíbel gardar un contacto, a axenda de enderezos aínda está aberta"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:47
+#: ../addressbook/addressbook.error.xml.h:48
 msgid ""
 "Cannot save a contact to the address book '{0}', because it is still "
 "opening. Either wait till it's opened, or select a different address book."
@@ -284,9 +287,9 @@ msgstr ""
 "enderezos distinta."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:734
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:744
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -319,81 +322,80 @@ msgid "Full _Name..."
 msgstr "_Nome completo…"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "_Desexa recibir o correo en HTML"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/widgets/eab-contact-merging.c:408
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:980
 msgid "Email"
 msgstr "Correo electrónico"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "_Desexa recibir o correo en HTML"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
 msgstr "Teléfono"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "SIP Address"
+msgstr "Enderezo SIP"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Instant Messaging"
 msgstr "Mensaxaría instantánea"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 #: ../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "_Home Page:"
 msgstr "Páxi_na web:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../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:1891
+#: ../modules/itip-formatter/itip-view.c:1881
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "_Free/Busy:"
 msgstr "_Dispoñibilidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "_Video Chat:"
 msgstr "_Videoconferencia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Home Page:"
 msgstr "Páxina web:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:96
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../modules/cal-config-google/e-cal-config-google.c:93
 msgid "Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Free/Busy:"
 msgstr "_Dispoñibilidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Video Chat:"
 msgstr "_Videoconferencia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "_Blog:"
 msgstr "_blogue:"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Blog:"
 msgstr "blogue:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Addresses"
-msgstr "Enderezos web"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-msgid "Web addresses"
+msgid "Web Addresses"
 msgstr "Enderezos web"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
@@ -442,8 +444,8 @@ msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../calendar/gui/e-calendar-view.c:1990
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -453,8 +455,8 @@ msgstr "Aniversario"
 #. * 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:691
-#: ../calendar/gui/e-calendar-view.c:2287 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../calendar/gui/e-calendar-view.c:1989 ../shell/main.c:125
 msgid "Birthday"
 msgstr "Aniversario"
 
@@ -491,28 +493,25 @@ msgid "_Address:"
 msgstr "_Enderezo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/e-contact-map.c:371
 #: ../addressbook/gui/widgets/eab-contact-display.c:356
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:371
 msgid "Home"
 msgstr "Particular"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:384
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../addressbook/gui/widgets/e-contact-map.c:384
 msgid "Work"
 msgstr "Traballo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:367
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:726
-#: ../calendar/gui/e-cal-model.c:3957
+#: ../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:3044
 msgid "Other"
 msgstr "Outros"
 
@@ -525,167 +524,187 @@ msgid "Notes"
 msgstr "Notas"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../calendar/gui/dialogs/comp-editor.c:1250
-#: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
-#: ../e-util/e-preferences-window.c:379
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
 #: ../shell/e-shell-window-actions.c:1086
 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:34
+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:53
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3575
+#: ../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/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:362
-#: ../addressbook/gui/widgets/eab-contact-merging.c:621
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../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
 #: ../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:204 ../e-util/e-send-options.ui.h:42
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/e-activity-bar.c:299 ../e-util/e-attachment-dialog.c:311
-#: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
-#: ../e-util/e-attachment-view.c:370 ../e-util/e-categories-dialog.c:82
-#: ../e-util/e-category-editor.c:138 ../e-util/e-category-editor.c:208
-#: ../e-util/e-charset-combo-box.c:101 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-mail-signature-script-dialog.c:366 ../e-util/e-passwords.c:468
+#: ../composer/e-composer-actions.c:267 ../e-util/e-activity-bar.c:340
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:490
+#: ../e-util/e-attachment-store.c:634 ../e-util/e-attachment-view.c:370
+#: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
+#: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
+#: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-html-editor-actions.c:472 ../e-util/e-html-editor-actions.c:565
+#: ../e-util/e-image-chooser-dialog.c:171
+#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:468
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
 #: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
-#: ../e-util/e-source-config-dialog.c:375
-#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
-#: ../e-util/e-web-view.c:3092 ../e-util/evolution-source-viewer.c:832
+#: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
+#: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/evolution-source-viewer.c:833 ../e-util/e-web-view.c:3043
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
-#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:278
-#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
-#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
+#: ../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:949
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:278
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:188
-#: ../modules/calendar/e-cal-attachment-handler.c:317
+#: ../modules/backup-restore/evolution-backup-tool.c:883
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:277
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:187
+#: ../modules/calendar/e-cal-attachment-handler.c:285
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
 #: ../plugins/publish-calendar/publish-calendar.c:806
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
-#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
+#: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
-#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
-#: ../smime/gui/e-cert-selector.c:232 ../smime/gui/smime-ui.ui.h:23
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:639
+#: ../smime/gui/certificate-manager.c:716
+#: ../smime/gui/certificate-manager.c:940 ../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:54
+#: ../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:624
+#: ../addressbook/gui/widgets/eab-contact-merging.c:721
 #: ../calendar/calendar.error.xml.h:47
-#: ../calendar/gui/dialogs/comp-editor.c:1278
-#: ../composer/e-composer-actions.c:205 ../composer/e-composer-actions.c:296
-#: ../e-util/e-attachment-store.c:546
-#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3093
+#: ../calendar/gui/dialogs/comp-editor.c:1277
+#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:381
+#: ../e-util/e-attachment-store.c:635
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3044
 #: ../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:640
+#: ../smime/gui/certificate-manager.c:717
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
-msgid "AIM"
-msgstr "AIM"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "Show Telephone"
+msgstr "Mostrar teléfono"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
-msgid "Jabber"
-msgstr "Jabber"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+msgid "Show SIP Address"
+msgstr "Mostrar enderezo SIP"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
-msgid "Yahoo"
-msgstr "Yahoo"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+msgid "Show Instant Messaging"
+msgstr "Mostrar mensaxaría instantánea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:605
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+msgid "Show Web Addresses"
+msgstr "Mostrar enderezos web"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:603
-msgid "MSN"
-msgstr "MSN"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+msgid "Show Job section"
+msgstr "Mostrar a sección de traballo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
-msgid "ICQ"
-msgstr "ICQ"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+msgid "Show Miscellaneous"
+msgstr "Mostrar varios"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+msgid "Show Home Mailing Address"
+msgstr "Mostrar enderezo de correo particular"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
-msgid "Skype"
-msgstr "Skype"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+msgid "Show Work Mailing Address"
+msgstr "Mostrar enderezo de correo do traballo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
-msgid "Twitter"
-msgstr "Twitter"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+msgid "Show Other Mailing Address"
+msgstr "Mostrar outro enderezo de correo"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+msgid "Show Notes"
+msgstr "Mostrar notas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../e-util/e-html-editor-actions.c:1027
+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
 msgid "Undo"
 msgstr "Desfacer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
-#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../e-util/e-html-editor-actions.c:985
+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
 msgid "Redo"
 msgstr "Refacer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 #: ../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:330
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Error modifying contact"
 msgstr "Produciuse un erro ao modificar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
 msgid "Error removing contact"
 msgstr "Produciuse un erro ao retirar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
+#: ../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:3576
-#: ../e-util/e-category-editor.c:146 ../plugins/face/face.c:292
-#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
+#: ../e-util/e-attachment-store.c:488 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:473 ../e-util/e-html-editor-actions.c:566
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:941
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -693,28 +712,28 @@ msgstr ""
 "Os datos do contacto son incorrectos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
 #, 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:3948
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» está baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
 msgid "Invalid contact."
 msgstr "Contacto incorrecto."
 
@@ -726,22 +745,23 @@ msgstr "Contacto incorrecto."
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 #: ../calendar/gui/dialogs/recurrence-page.c:2323
-#: ../e-util/e-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
-#: ../e-util/e-timezone-dialog.ui.h:3 ../e-util/e-attachment-dialog.c:313
-#: ../e-util/e-categories-dialog.c:83 ../e-util/e-category-editor.c:209
-#: ../e-util/e-charset-combo-box.c:102 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-passwords.c:469 ../e-util/e-rule-context.c:816
-#: ../e-util/e-rule-editor.c:181 ../e-util/e-rule-editor.c:283
-#: ../e-util/e-rule-editor.c:777 ../e-util/e-source-config-dialog.c:376
-#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
-#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:243
-#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
+#: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
+#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
+#: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
+#: ../e-util/e-html-editor-link-dialog.c:370 ../e-util/e-passwords.c:469
+#: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
+#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
+#: ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
+#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
 #: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
 #: ../mail/mail-vfolder-ui.c:271
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:167 ../smime/gui/e-cert-selector.c:233
+#: ../shell/main.c:166 ../smime/gui/e-cert-selector.c:238
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_Aceptar"
@@ -754,15 +774,15 @@ msgstr "Adición rápida de contacto"
 msgid "_Edit Full"
 msgstr "_Editar completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "Correo _electrónico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
 msgid "_Select Address Book"
 msgstr "_Seleccionar a axenda de enderezos"
 
@@ -870,14 +890,13 @@ msgstr "Retirar un enderezo de correo-e da lista"
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:23
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/filter.ui.h:18
-#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:224
-#: ../e-util/e-mail-signature-manager.c:367
-#: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
-#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:627
-#: ../mail/mail-config.ui.h:52
+#: ../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:366
+#: ../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:54
 #: ../plugins/attachment-reminder/attachment-reminder.c:567
-#: ../plugins/email-custom-header/email-custom-header.c:848
+#: ../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
@@ -916,41 +935,254 @@ msgstr "_Final"
 msgid "Contact List Members"
 msgstr "Membros da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
 msgstr "_Membros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
 msgstr "Produciuse un erro ao engadir a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
 msgstr "Produciuse un erro ao modificar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
 msgstr "Produciuse un erro ao retirar a lista"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../modules/addressbook/e-book-shell-view-actions.c:1253
+msgid "Name contains"
+msgstr "O nome contén"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+msgid "Email begins with"
+msgstr "O correo comeza por"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Any field contains"
+msgstr "Calquera campo contén"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+msgid "evolution address book"
+msgstr "axenda de enderezos do Evolution"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+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
+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
+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
+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:996
+#, c-format
+msgid "Click to mail %s"
+msgstr "Prema para enviar un correo a %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "Abrir mapa"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr "SIP"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "Membros da lista:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "Alcume"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "Empresa"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "Departamento"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Oficina"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "Profesión"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "Cargo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "Director"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "Secretaria/o"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+msgid "Video Chat"
+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:569
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Calendario"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Dispoñibilidade"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "Teléfono"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+msgid "Fax"
+msgstr "Fax"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+msgid "Address"
+msgstr "Enderezo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "Páxina persoal"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "Diario web"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Teléfono móbil"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "Cónxuxe"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "Persoal"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "Nota"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "Membros da lista"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "Posto de traballo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "Páxina web"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+msgid "Blog"
+msgstr "Blogue"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:261
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+#: ../addressbook/gui/widgets/eab-contact-merging.c:457
 msgid "Merge Contact"
 msgstr "Combinar o contacto"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:363
-#: ../addressbook/gui/widgets/eab-contact-merging.c:627
+#: ../addressbook/gui/widgets/eab-contact-merging.c:475
+#: ../addressbook/gui/widgets/eab-contact-merging.c:724
 msgid "_Merge"
 msgstr "_Combinar"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:616
+#: ../addressbook/gui/widgets/eab-contact-merging.c:713
 msgid "Duplicate Contact Detected"
 msgstr "Detectouse un contacto duplicado"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:674
+#: ../addressbook/gui/widgets/eab-contact-merging.c:771
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -958,7 +1190,7 @@ msgstr ""
 "O nome ou o enderezo de correo electrónico deste contacto xa existe\n"
 "neste cartafol. Desexa gardalos cambios de todas formas?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:677
+#: ../addressbook/gui/widgets/eab-contact-merging.c:774
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -966,41 +1198,138 @@ msgstr ""
 "O nome ou enderezo de correo deste contacto xa existe neste\n"
 "cartafol. Desexa engadilo de todas as formas?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+#: ../addressbook/gui/widgets/eab-contact-merging.c:789
 msgid "Changed Contact:"
 msgstr "Contacto modificado:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:694
+#: ../addressbook/gui/widgets/eab-contact-merging.c:791
 msgid "New Contact:"
 msgstr "Contacto novo:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+#: ../addressbook/gui/widgets/eab-contact-merging.c:830
 msgid "Conflicting Contact:"
 msgstr "Contacto en conflito:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:735
+#: ../addressbook/gui/widgets/eab-contact-merging.c:832
 msgid "Old Contact:"
 msgstr "Contacto antigo: "
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1150
-msgid "Name contains"
-msgstr "O nome contén"
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Non é posíbel abrir esta axenda de enderezos. Isto significa que esta axenda "
+"non está marcada para o seu uso sen conexión ou ben que aínda non foi "
+"descargada para o seu uso sen conexión. Cargue unha vez a axenda de "
+"enderezos no modo conectado para descargar os seus contidos."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1143
-msgid "Email begins with"
-msgstr "O correo comeza por"
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Non é posíbel abrir esta axenda de enderezos. Comprobe que a ruta %s existe "
+"e que están estabelecidos os permisos para acceder a ela."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1136
-#: ../modules/calendar/e-cal-shell-view-actions.c:1770
-#: ../modules/calendar/e-memo-shell-view-actions.c:790
-#: ../modules/calendar/e-task-shell-view-actions.c:989
-msgid "Any field contains"
-msgstr "Calquera campo contén"
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"Esta versión do Evolution non ten compilada a compatiblidade LDAP.  Para "
+"usar o LDAP no Evolution ten que instalar un paquete coas capacidades LDAP "
+"activadas."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Non é posíbel abrir esta axenda de enderezos. Isto pode significar que se "
+"introduciu un URI incorrecto ou que o servidor non é accesíbel."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "Detailed error message:"
+msgstr "Mensaxe de erro detallada:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"Hai máis tarxetas coincidentes con esta consulta das que os servidor\n"
+"está configurado para devolver ou o Evolution está configurado para "
+"mostrar.\n"
+"Faga unha busca máis específica ou eleve o límite dos resultados\n"
+"nas preferencias do servidor de cartafoles para esta axenda de enderezos."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"O tempo para executar esta consulta excedeu o límite do servidor ou ben\n"
+"excedeu o límite configurado para esta axenda de enderezos. Faga unha busca\n"
+"máis específica ou eleve o límite dos resultados nas preferencias do "
+"servidor\n"
+"de cartafoles para esta axenda de enderezos."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr ""
+"A infraestrutura desta axenda de enderezos non conseguiu analizar esta "
+"consulta. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "A infraestrutura desta axenda de enderezos rexeitou esta consulta. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Esta consulta non rematou correctamente. %s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "Seleccionar a axenda de enderezos"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "lista"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "Mover o contacto a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "Copiar o contacto a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "Mover os contactos a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "Copiar os contactos a"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
@@ -1038,7 +1367,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Pegar os contactos desde o portapapeis"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:1053
 msgid "Delete selected contacts"
 msgstr "Eliminar os contactos seleccionados"
 
@@ -1073,15 +1402,15 @@ 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:1243
-#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:740
-#: ../e-util/evolution-source-viewer.c:803
-#: ../mail/e-mail-account-manager.c:737
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:844
-#: ../modules/mail/e-mail-shell-view-actions.c:1561
+#: ../calendar/gui/dialogs/comp-editor.c:1242
+#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:785
+#: ../e-util/evolution-source-viewer.c:804
+#: ../mail/e-mail-account-manager.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:1125
+#: ../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:1654
 #: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "E_liminar"
@@ -1122,11 +1451,6 @@ msgstr "Nome propio"
 msgid "Family Name"
 msgstr "Apelidos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
-msgid "Nickname"
-msgstr "Alcume"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "Correo electrónico 2"
@@ -1179,11 +1503,6 @@ msgstr "Fax particular"
 msgid "ISDN Phone"
 msgstr "Teléfono RDSI"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
-msgid "Mobile Phone"
-msgstr "Teléfono móbil"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Outro teléfono"
@@ -1218,20 +1537,10 @@ msgstr "Télex"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
-msgid "Company"
-msgstr "Empresa"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Unidade"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-msgid "Office"
-msgstr "Oficina"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Título"
@@ -1242,16 +1551,6 @@ msgstr "Título"
 msgid "Role"
 msgstr "Función"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-msgid "Manager"
-msgstr "Director"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:657
-msgid "Assistant"
-msgstr "Secretaria/o"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Sitio Web"
@@ -1268,33 +1567,56 @@ msgstr "Xornal"
 msgid "Categories"
 msgstr "Categorías"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
-msgid "Spouse"
-msgstr "Cónxuxe"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "Abrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
-msgid "Note"
-msgstr "Nota"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "Lista de contactos: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "Contacto: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:187
+msgid "evolution minicard"
+msgstr "minitarxeta do Evolution"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "Contacto novo"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:375
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "Lista de contactos nova"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "o cartafol das axendas de enderezos actual %s ten %d tarxeta"
+msgstr[1] "o cartafol das axendas de enderezos actual %s ten %d tarxetas"
+
+#: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
 msgstr "Mapa dos contactos"
 
 #. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#: ../addressbook/gui/widgets/e-contact-map-window.c:412
 msgid "Zoom _In"
 msgstr "_Ampliar"
 
 #. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:418
-#: ../mail/e-mail-reader.c:2226
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420
+#: ../mail/e-mail-reader.c:2230
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
 #. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:448
+#: ../addressbook/gui/widgets/e-contact-map-window.c:450
+#: ../e-util/e-html-editor-actions.c:1939
+#: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:1021
 msgid "_Find"
 msgstr "_Buscar"
@@ -1357,287 +1679,12 @@ msgstr ""
 "\n"
 "Non hai elementos para mostrar nesta vista."
 
-#: ../addressbook/gui/widgets/e-minicard.c:92
-msgid "Work Email"
-msgstr "Correo electrónico do traballo"
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Home Email"
-msgstr "Correo electrónico particular"
-
-#: ../addressbook/gui/widgets/e-minicard.c:94
-#: ../addressbook/gui/widgets/e-minicard.c:827
-msgid "Other Email"
-msgstr "Outro correo electrónico"
-
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
-msgid "evolution address book"
-msgstr "axenda de enderezos do Evolution"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
-msgid "New Contact"
-msgstr "Contacto novo"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact List"
-msgstr "Lista de contactos nova"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "o cartafol das axendas de enderezos actual %s ten %d tarxeta"
-msgstr[1] "o cartafol das axendas de enderezos actual %s ten %d tarxetas"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:33
-msgid "Open"
-msgstr "Abrir"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:159
-msgid "Contact List: "
-msgstr "Lista de contactos: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact: "
-msgstr "Contacto: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:187
-msgid "evolution minicard"
-msgstr "minitarxeta do Evolution"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
-msgid "Copy _Email Address"
-msgstr "Copiar o _enderezo de correo"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
-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-gtkhtml.c:432 ../e-util/e-web-view.c:309
-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-gtkhtml.c:434 ../e-util/e-web-view.c:311
-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-gtkhtml.c:969 ../e-util/e-web-view.c:992
-#, c-format
-msgid "Click to mail %s"
-msgstr "Prema para enviar un correo a %s"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
-msgid "Open map"
-msgstr "Abrir mapa"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:535
-msgid "List Members:"
-msgstr "Membros da lista:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-msgid "Department"
-msgstr "Departamento"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-msgid "Profession"
-msgstr "Profesión"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
-msgid "Position"
-msgstr "Cargo"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
-msgid "Video Chat"
-msgstr "Videoconferencia"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:659
-#: ../e-util/e-send-options.c:545
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
-#: ../modules/calendar/e-cal-shell-view.c:590
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Calendario"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:660
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../calendar/gui/dialogs/event-editor.c:342
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "Dispoñibilidade"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:661
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
-msgid "Phone"
-msgstr "Teléfono"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:662
-msgid "Fax"
-msgstr "Fax"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:716
-msgid "Address"
-msgstr "Enderezo"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
-msgid "Home Page"
-msgstr "Páxina persoal"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-msgid "Web Log"
-msgstr "Diario web"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-msgid "Personal"
-msgstr "Persoal"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:944
-msgid "List Members"
-msgstr "Membros da lista"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:965
-msgid "Job Title"
-msgstr "Posto de traballo"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
-msgid "Home page"
-msgstr "Páxina web"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1016
-msgid "Blog"
-msgstr "Blogue"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:121
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Non é posíbel abrir esta axenda de enderezos. Isto significa que esta axenda "
-"non está marcada para o seu uso sen conexión ou ben que aínda non foi "
-"descargada para o seu uso sen conexión. Cargue unha vez a axenda de "
-"enderezos no modo conectado para descargar os seus contidos."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Non é posíbel abrir esta axenda de enderezos. Comprobe que a ruta %s existe "
-"e que están estabelecidos os permisos para acceder a ela."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"Esta versión do Evolution non ten compilada a compatiblidade LDAP.  Para "
-"usar o LDAP no Evolution ten que instalar un paquete coas capacidades LDAP "
-"activadas."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Non é posíbel abrir esta axenda de enderezos. Isto pode significar que se "
-"introduciu un URI incorrecto ou que o servidor non é accesíbel."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
-msgid "Detailed error message:"
-msgstr "Mensaxe de erro detallada:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"Hai máis tarxetas coincidentes con esta consulta das que os servidor\n"
-"está configurado para devolver ou o Evolution está configurado para "
-"mostrar.\n"
-"Faga unha busca máis específica ou eleve o límite dos resultados\n"
-"nas preferencias do servidor de cartafoles para esta axenda de enderezos."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:218
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"O tempo para executar esta consulta excedeu o límite do servidor ou ben\n"
-"excedeu o límite configurado para esta axenda de enderezos. Faga unha busca\n"
-"máis específica ou eleve o límite dos resultados nas preferencias do "
-"servidor\n"
-"de cartafoles para esta axenda de enderezos."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr ""
-"A infraestrutura desta axenda de enderezos non conseguiu analizar esta "
-"consulta. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr "A infraestrutura desta axenda de enderezos rexeitou esta consulta. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:237
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "Esta consulta non rematou correctamente. %s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:265
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-msgid "Select Address Book"
-msgstr "Seleccionar a axenda de enderezos"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
-msgid "list"
-msgstr "lista"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
-msgid "Move contact to"
-msgstr "Mover o contacto a"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Copy contact to"
-msgstr "Copiar o contacto a"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
-msgid "Move contacts to"
-msgstr "Mover os contactos a"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Copy contacts to"
-msgstr "Copiar os contactos a"
-
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:439
-#: ../calendar/importers/icalendar-importer.c:934
-#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:935
+#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Importando…"
 
@@ -1683,47 +1730,47 @@ msgstr "Importador de vCard do Evolution"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:763
+#: ../addressbook/printing/e-contact-print.c:874
 #, c-format
 msgid "Page %d"
 msgstr "Páxina %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "Specify the output file instead of standard output"
 msgstr "Indicar o ficheiro de saída en vez da saída estándar"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:54
 msgid "OUTPUTFILE"
 msgstr "FICHEIRO DE SAÍDA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "List local address book folders"
 msgstr "Listar os cartafoles de axendas de enderezos locais"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
 msgstr "Mostrar as tarxetas como un ficheiro vcard ou csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:110
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Erro nos argumentos da liña de ordes. Use a opción --help para ver a "
 "utilización."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:147
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "Only support csv or vcard format."
 msgstr "Só é compatíbel cos formatos csv ou vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:178
+#: ../addressbook/tools/evolution-addressbook-export.c:155
 msgid "Unhandled error"
 msgstr "Erro non manipulado"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 msgid "Can not open file"
 msgstr "Non foi posíbel abrir o ficheiro"
@@ -1733,6 +1780,124 @@ msgstr "Non foi posíbel abrir o ficheiro"
 msgid "Failed to open client '%s': %s"
 msgstr "Produciuse un erro ao abrir o cliente «%s» (%s)"
 
+#: ../addressbook/util/eab-book-util.c:36
+msgctxt "addressbook-label"
+msgid "Work Email"
+msgstr "Correo electrónico do traballo"
+
+#: ../addressbook/util/eab-book-util.c:37
+msgctxt "addressbook-label"
+msgid "Home Email"
+msgstr "Correo electrónico particular"
+
+#: ../addressbook/util/eab-book-util.c:38
+msgctxt "addressbook-label"
+msgid "Other Email"
+msgstr "Outro correo electrónico"
+
+#: ../addressbook/util/eab-book-util.c:44
+msgctxt "addressbook-label"
+msgid "Work SIP"
+msgstr "SIP do traballo"
+
+#: ../addressbook/util/eab-book-util.c:45
+msgctxt "addressbook-label"
+msgid "Home SIP"
+msgstr "SIP particular"
+
+#: ../addressbook/util/eab-book-util.c:46
+msgctxt "addressbook-label"
+msgid "Other SIP"
+msgstr "Outro SIP"
+
+#: ../addressbook/util/eab-book-util.c:74
+msgctxt "addressbook-label"
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/util/eab-book-util.c:75
+msgctxt "addressbook-label"
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/util/eab-book-util.c:76
+msgctxt "addressbook-label"
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/util/eab-book-util.c:77
+msgctxt "addressbook-label"
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/util/eab-book-util.c:78
+msgctxt "addressbook-label"
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/util/eab-book-util.c:79
+msgctxt "addressbook-label"
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/util/eab-book-util.c:80
+msgctxt "addressbook-label"
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/util/eab-book-util.c:81
+msgctxt "addressbook-label"
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/util/eab-book-util.c:82
+msgctxt "addressbook-label"
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/util/eab-book-util.c:83
+msgctxt "addressbook-label"
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#. To Translators:
+#. * if an email address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:126
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. To Translators:
+#. * if a SIP address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * SIP=Session Initiation Protocol, used for voice over IP
+#.
+#: ../addressbook/util/eab-book-util.c:173
+msgctxt "addressbook-label"
+msgid "SIP"
+msgstr "SIP"
+
+#. To Translators:
+#. * if an IM address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * IM=Instant Messaging
+#.
+#: ../addressbook/util/eab-book-util.c:216
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "IM"
+
+#. To Translators:
+#. * if a phone number type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:269
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "Teléfono"
+
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
@@ -1773,16 +1938,16 @@ 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:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1321
 #: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#: ../calendar/gui/dialogs/task-page.ui.h:32 ../e-util/filter.ui.h:17
-#: ../e-util/e-categories-editor.c:278
-#: ../e-util/e-mail-signature-manager.c:357
-#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:56
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../e-util/e-categories-editor.c:278 ../e-util/e-html-editor-actions.c:1057
+#: ../e-util/e-mail-signature-manager.c:356 ../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:58
 #: ../plugins/attachment-reminder/attachment-reminder.c:562
-#: ../plugins/email-custom-header/email-custom-header.c:843
+#: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/mail-to-task/mail-to-task.c:594
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
@@ -1794,16 +1959,16 @@ msgstr "_Editar"
 msgid "_Print"
 msgstr "Im_primir"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
 msgid "_Dismiss"
 msgstr "_Ignorar"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1835
-#: ../calendar/alarm-notify/alarm-queue.c:1845
+#: ../calendar/alarm-notify/alarm-queue.c:1854
+#: ../calendar/alarm-notify/alarm-queue.c:1864
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../modules/itip-formatter/itip-view.c:1503
-#: ../modules/itip-formatter/itip-view.c:1614
+#: ../modules/itip-formatter/itip-view.c:1493
+#: ../modules/itip-formatter/itip-view.c:1604
 msgid "Location:"
 msgstr "Localización:"
 
@@ -1818,71 +1983,71 @@ msgstr "Tempo antes da repetición:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:142
-#: ../modules/calendar/e-cal-shell-view-actions.c:351
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:326
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "días"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:11
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:140
+#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "horas"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:138
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "minutos"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1834
 msgid "No summary available."
 msgstr "Non hai un resumo dispoñíbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1706
+#: ../calendar/alarm-notify/alarm-queue.c:1708
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñíbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1716
 msgid "No location information available."
 msgstr "Non hai información da localización dispoñíbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1702
-#: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2147
+#: ../calendar/alarm-notify/alarm-queue.c:1721
+#: ../calendar/alarm-notify/alarm-queue.c:1825
+#: ../calendar/alarm-notify/alarm-queue.c:2166
 msgid "Evolution Reminders"
 msgstr "Recordatorios de Evolution"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1765
 #, 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:1965
+#: ../calendar/alarm-notify/alarm-queue.c:1984
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:1985 ../mail/mail-dialogs.ui.h:21
 #: ../mail/mail.error.xml.h:139
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Non"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:1986 ../mail/mail.error.xml.h:138
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Si"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1971
+#: ../calendar/alarm-notify/alarm-queue.c:1990
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1899,7 +2064,7 @@ msgstr ""
 "\n"
 "Está seguro de que desexa executar este programa?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../calendar/alarm-notify/alarm-queue.c:2005
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
@@ -1908,7 +2073,7 @@ msgid "invalid time"
 msgstr "hora incorrecta"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:369
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -1917,7 +2082,7 @@ msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:375
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -1928,7 +2093,7 @@ msgstr[1] "%d minutos"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2343,68 +2508,225 @@ msgstr "A lista de notas non está marcada para o seu uso sen conexión."
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:87
+msgid "Failed to open calendar '{0}'"
+msgstr "Produciuse un fallo ao abrir o calendario «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:89
+msgid "Failed to open memo list '{0}'"
+msgstr "Produciuse un fallo ao abrir a lista de recordatorios «{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:91
+msgid "Failed to open task list '{0}'"
+msgstr "Produciuse un fallo ao abrir a lista de tarefas «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+msgid "Failed to create an event in a calendar '{0}'"
+msgstr "Produciuse un fallo ao crear un evento nun calendario «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:95
+#, fuzzy
+msgid "Failed to create a memo in a memo list '{0}'"
+msgstr ""
+"Produciuse un fallo ao copiar unha recordatorio na lista de recordatorios "
+"«{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:97
+#, fuzzy
+msgid "Failed to create a task in a task list '{0}'"
+msgstr "Produciuse un fallo ao copiar unha tarefa na lista de tarefas «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+#, fuzzy
+msgid "Failed to modify an event in a calendar '{0}'"
+msgstr "Produciuse un fallo ao mover un evento o calendario «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:101
+#, fuzzy
+msgid "Failed to modify a memo in a memo list '{0}'"
+msgstr ""
+"Produciuse un fallo ao mover unha recordatorio na lista de recordatorios "
+"«{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:103
+#, fuzzy
+msgid "Failed to modify a task in a task list '{0}'"
+msgstr "Produciuse un fallo ao mover unha tarefa na lista de tarefas «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+#, fuzzy
+msgid "Failed to delete an event in a calendar '{0}'"
+msgstr "Produciuse un fallo ao mover un evento o calendario «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:107
+#, fuzzy
+msgid "Failed to delete a memo in a memo list '{0}'"
+msgstr ""
+"Produciuse un fallo ao mover unha recordatorio na lista de recordatorios "
+"«{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:109
+#, fuzzy
+msgid "Failed to delete a task in a task list '{0}'"
+msgstr "Produciuse un fallo ao mover unha tarefa na lista de tarefas «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:111
+#, fuzzy
+msgid "Failed to update an event in a calendar '{0}'"
+msgstr "Produciuse un fallo ao mover un evento o calendario «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:113
+#, fuzzy
+msgid "Failed to update a memo in a memo list '{0}'"
+msgstr ""
+"Produciuse un fallo ao mover unha recordatorio na lista de recordatorios "
+"«{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:115
+#, fuzzy
+msgid "Failed to update a task in a task list '{0}'"
+msgstr "Produciuse un fallo ao mover unha tarefa na lista de tarefas «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:117
+#, fuzzy
+msgid "Failed to send an event to a calendar '{0}'"
+msgstr "Produciuse un fallo ao mover un evento o calendario «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:119
+#, fuzzy
+msgid "Failed to send a memo to a memo list '{0}'"
+msgstr ""
+"Produciuse un fallo ao mover unha recordatorio na lista de recordatorios "
+"«{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:121
+#, fuzzy
+msgid "Failed to send a task to a task list '{0}'"
+msgstr "Produciuse un fallo ao mover unha tarefa na lista de tarefas «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:123
+#, fuzzy
+msgid "Error creating view for a calendar '{0}'"
+msgstr "Produciuse un erro ao cargar o calendario «{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:125
+#, fuzzy
+msgid "Error creating view for a task list '{0}'"
+msgstr "Produciuse un erro ao cargar a lista de tarefas «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:127
+#, fuzzy
+msgid "Error creating view for a memo list '{0}'"
+msgstr "Produciuse un erro ao cargar a lista de recordatorios «{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "Produciuse un fallo ao copiar un evento o calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:131
 msgid "Failed to copy a task into the task list '{0}'"
 msgstr "Produciuse un fallo ao copiar unha tarefa na lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:133
 msgid "Failed to copy a memo into the memo list '{0}'"
 msgstr ""
 "Produciuse un fallo ao copiar unha recordatorio na lista de recordatorios "
 "«{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:135
 msgid "Failed to move an event into the calendar '{0}'"
 msgstr "Produciuse un fallo ao mover un evento o calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to move a task into the task list '{0}'"
 msgstr "Produciuse un fallo ao mover unha tarefa na lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:139
 msgid "Failed to move a memo into the memo list '{0}'"
 msgstr ""
 "Produciuse un fallo ao mover unha recordatorio na lista de recordatorios "
 "«{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:141
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Copiando un evento no calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:143
 msgid "Copying a task into the task list '{0}'"
 msgstr "Copiando unha tarefa na lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:145
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "Copiando de recordatorio na lista de recordatorios «{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:147
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Movendo un evento no calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:149
 msgid "Moving a task into the task list '{0}'"
 msgstr "Movendo unha tarefa na lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:151
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "Movendo un recordatorio na lista de recordatorios «{0}»?"
 
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:153
+#, fuzzy
+msgid "Failed to refresh calendar '{0}'"
+msgstr "Desexa eliminar o calendario remoto «{0}»?"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:155
+#, fuzzy
+msgid "Failed to refresh task list '{0}'"
+msgstr "Produciuse un fallo ao mover unha tarefa na lista de tarefas «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:157
+#, fuzzy
+msgid "Failed to refresh memo list '{0}'"
+msgstr ""
+"Produciuse un fallo ao mover unha recordatorio na lista de recordatorios "
+"«{0}»"
+
+#: ../calendar/calendar.error.xml.h:158
+#, fuzzy
+msgid "Failed to make an occurrence movable"
+msgstr "Facer esta aparición _desprazábel"
+
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
@@ -2427,7 +2749,7 @@ msgstr "non contén"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
+#: ../e-util/e-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Descrición"
@@ -2455,24 +2777,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:249 ../calendar/gui/e-cal-model.c:453
-#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
+#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278
+#: ../calendar/gui/e-cal-model.c:285 ../calendar/gui/e-task-table.c:498
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "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:250 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287
+#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "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:251 ../calendar/gui/e-cal-model.c:464
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-send-options.ui.h:7
+#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289
+#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-html-editor-page-dialog.c:114 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Confidencial"
 
@@ -2496,7 +2818,7 @@ msgid "Location"
 msgstr "Localización"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:326
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
 msgid "Category"
 msgstr "Categoría"
 
@@ -2558,22 +2880,22 @@ msgid "Edit Reminder"
 msgstr "Editar recordatorio"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/e-alarm-list.c:424
 msgid "Pop up an alert"
 msgstr "Alerta emerxente"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:407
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Play a sound"
 msgstr "Reproducir un son"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:419
+#: ../calendar/gui/e-alarm-list.c:432
 msgid "Run a program"
 msgstr "Executar un programa"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:428
 msgid "Send an email"
 msgstr "Enviar unha mensaxe de correo-e"
 
@@ -2627,10 +2949,6 @@ msgstr "_Repetir o recordatorio"
 msgid "extra times every"
 msgstr "veces adicionais cada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
-msgid "Options"
-msgstr "Opcións"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "_Mensaxe personalizada"
@@ -2725,273 +3043,277 @@ msgstr "%s  Non realizou modificacións. Desexa actualizar o editor?"
 msgid "Could not save attachments"
 msgstr "Non foi posíbel gardar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:625
 msgid "Could not update object"
 msgstr "Non foi posíbel actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:759
 msgid "Edit Appointment"
 msgstr "Editar a cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:768
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/dialogs/comp-editor.c:781
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:798
+#: ../calendar/gui/dialogs/comp-editor.c:797
 msgid "No Summary"
 msgstr "Sen resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:919
+#: ../calendar/gui/dialogs/comp-editor.c:918
 msgid "Keep original item?"
 msgstr "Desexa gardar o elemento orixinal?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Unable to synchronize with the server"
 msgstr "Non foi posíbel sincronizar co servidor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#. == Button box ==
+#: ../calendar/gui/dialogs/comp-editor.c:1221
 #: ../calendar/gui/dialogs/event-editor.c:116
 #: ../calendar/gui/dialogs/event-editor.c:310
 #: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:275
-#: ../e-util/e-mail-signature-editor.c:307
+#: ../composer/e-composer-actions.c:360 ../e-util/e-html-editor-dialog.c:196
+#: ../e-util/e-mail-signature-editor.c:295
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
 #: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
 #: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
-#: ../smime/gui/certificate-manager.c:1182
+#: ../smime/gui/certificate-manager.c:1504
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1223
 msgid "Close the current window"
 msgstr "Pechar a xanela actual"
 
 #. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:730
-#: ../e-util/e-text.c:2085 ../e-util/e-web-view-gtkhtml.c:452
-#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
+#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:936 ../e-util/e-text.c:2089
+#: ../e-util/e-web-view.c:339 ../mail/e-mail-browser.c:133
 #: ../shell/e-shell-window-actions.c:930
 msgid "_Copy"
 msgstr "_Copiar…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
-#: ../e-util/e-focus-tracker.c:230 ../e-util/e-focus-tracker.c:731
-#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
-#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1307
-#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
+#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
+#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1325 ../mail/e-mail-browser.c:135
+#: ../shell/e-shell-window-actions.c:932
 msgid "Copy the selection"
 msgstr "Copiar a selección"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
-#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
-#: ../shell/e-shell-window-actions.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:943 ../e-util/e-text.c:2075
+#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:937
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
-#: ../e-util/e-focus-tracker.c:223 ../e-util/e-focus-tracker.c:726
-#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1301
+#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
+#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1319
 #: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
 msgid "Cut the selection"
 msgstr "Cortar a selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
-#: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
+#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
+#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
 #: ../shell/e-shell-window-actions.c:946
 msgid "Delete the selection"
 msgstr "Eliminar a selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "View help"
 msgstr "Ver a axuda"
 
 #. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:735
-#: ../e-util/e-text.c:2097 ../mail/e-mail-browser.c:147
-#: ../shell/e-shell-window-actions.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:971 ../e-util/e-text.c:2101
+#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:965
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
-#: ../e-util/e-focus-tracker.c:237 ../e-util/e-focus-tracker.c:736
-#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
+#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1331
 #: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
-#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2128
-#: ../modules/addressbook/e-book-shell-view-actions.c:1160
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1263
+#: ../composer/e-composer-actions.c:414 ../mail/e-mail-reader.c:2132
+#: ../modules/addressbook/e-book-shell-view-actions.c:1263
+#: ../modules/addressbook/e-book-shell-view-actions.c:1277
 msgid "_Print..."
 msgstr "_Imprimir…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2135
-#: ../modules/addressbook/e-book-shell-view-actions.c:1167
-#: ../modules/calendar/e-cal-shell-view-actions.c:1801
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2139
+#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../modules/calendar/e-cal-shell-view-actions.c:1642
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Pre_view..."
 msgstr "Previsuliazar…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "Save current changes"
 msgstr "Gardar os cambios actuais"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
-#: ../e-util/e-mail-signature-editor.c:316
+#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
 msgstr "Gardar e pechar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Save current changes and close editor"
 msgstr "Gardar os cambios actuais e pechar o editor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:745
-#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
+#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:992 ../e-util/e-web-view.c:349
 #: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
-#: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
+#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
+#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
 #: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "_Classification"
 msgstr "_Clasificación"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
-#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
+#: ../calendar/gui/dialogs/comp-editor.c:1328
+#: ../e-util/e-html-editor-actions.c:1064
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
 #: ../shell/e-shell-window-actions.c:1079
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1342
+#: ../e-util/e-html-editor-actions.c:1085
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../composer/e-composer-actions.c:319
+#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../composer/e-composer-actions.c:404
 msgid "_Options"
 msgstr "_Opcións"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1106 ../mail/e-mail-browser.c:177
 #: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Vista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
-#: ../composer/e-composer-actions.c:268
+#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../composer/e-composer-actions.c:353
 msgid "_Attachment..."
 msgstr "_Anexo…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
-#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../composer/e-composer-actions.c:355 ../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1376
 msgid "_Categories"
 msgstr "_Categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1378
 msgid "Toggles whether to display categories"
 msgstr "Alterna a vista das categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1385
+#: ../calendar/gui/dialogs/comp-editor.c:1384
 msgid "Time _Zone"
 msgstr "_Fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1386
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna a vista do fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1398
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Classify as public"
 msgstr "Clasificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1411
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "R_ole Field"
 msgstr "Campo da _función"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1421
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna a vista do campo da función"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna a vista do campo RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1435
 msgid "_Status Field"
 msgstr "Campo de e_stado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "Toggles whether the Status field is displayed"
 msgstr "Alterna a vista do campo de estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1443
 msgid "_Type Field"
 msgstr "Campo do _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna a vista do campo de tipo de participante"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../composer/e-composer-actions.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../composer/e-composer-actions.c:573
 msgid "Attach"
 msgstr "Anexar"
 
@@ -3017,21 +3339,25 @@ msgstr "Non é posíbel usar a versión actual!"
 msgid "Validation error: %s"
 msgstr "Erro de validación: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:120
-msgid "Could not open destination"
-msgstr "Non foi posíbel abrir o destino"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:129
+#: ../calendar/gui/e-cal-ops.c:1938
 msgid "Destination is read only"
 msgstr "O destino é só de lectura"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:172
-msgid "Cannot create object"
-msgstr "Non é posíbel crear o obxecto"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:209
+#, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "Copiando eventos no calendario %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:203
-msgid "Could not open source"
-msgstr "Non foi posíbel abrir a fonte"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:215
+#, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "Copiando recordatorios na lista de recordatorios «%s»"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:221
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "Copiando tarefas na lista de tarefas «%s»"
 
 #: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Delete this item from all other recipient's mailboxes?"
@@ -3042,70 +3368,6 @@ msgstr ""
 msgid "_Retract comment"
 msgstr "_Retirar o comentario"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:54
-#, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "Non foi posíbel eliminar a actividade debido a un erro dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:58
-#, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "Non foi posíbel eliminar a tarefa debido a un erro dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:62
-#, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "Non foi posíbel eliminar a nota debido a un erro dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:66
-#, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "Non foi posíbel eliminar o elemento debido a un erro dbus: %s"
-
-#: ../calendar/gui/dialogs/delete-error.c:73
-msgid "The event could not be deleted because permission was denied"
-msgstr "Non foi posíbel eliminar a actividade porque se denegou o permiso"
-
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The task could not be deleted because permission was denied"
-msgstr "Non foi posíbel eliminar a tarefa porque se denegou o permiso"
-
-#: ../calendar/gui/dialogs/delete-error.c:79
-msgid "The memo could not be deleted because permission was denied"
-msgstr "Non foi posíbel eliminar a nota porque se denegou o permiso"
-
-#: ../calendar/gui/dialogs/delete-error.c:82
-msgid "The item could not be deleted because permission was denied"
-msgstr "Non foi posíbel eliminar o elemento porque se denegou o permiso"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:90
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "Non foi posíbel eliminar a actividade debido a un erro: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:94
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "Non foi posíbel eliminar a tarefa debido a un erro: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:98
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "Non foi posíbel eliminar a nota debido a un erro: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:102
-#, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "Non foi posíbel eliminar o elemento debido a un erro: %s"
-
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Enter Delegate"
 msgstr "Introducir un delegado"
@@ -3167,7 +3429,7 @@ msgstr "_Dispoñibilidade"
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar a información de dispoñibilidade para os participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
 msgid "Appointment"
 msgstr "Cita"
 
@@ -3198,7 +3460,7 @@ msgstr ""
 "organizador"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3171
+#: ../calendar/gui/dialogs/event-page.c:3178
 msgid "This event has reminders"
 msgstr "Esta actividade ten recordatorios"
 
@@ -3207,78 +3469,78 @@ msgstr "Esta actividade ten recordatorios"
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:1302
+#: ../calendar/gui/dialogs/event-page.c:1309
 msgid "Event with no start date"
 msgstr "Actividade sen data de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "Event with no end date"
 msgstr "Actividade sen data de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/event-page.c:1490
 #: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1030
+#: ../calendar/gui/dialogs/task-page.c:1032
 msgid "Start date is wrong"
 msgstr "A data de inicio é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1494
+#: ../calendar/gui/dialogs/event-page.c:1501
 msgid "End date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1518
+#: ../calendar/gui/dialogs/event-page.c:1525
 msgid "Start time is wrong"
 msgstr "A hora de inicio é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1526
+#: ../calendar/gui/dialogs/event-page.c:1533
 msgid "End time is wrong"
 msgstr "A hora de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/event-page.c:1697
 #: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1084
+#: ../calendar/gui/dialogs/task-page.c:1086
 msgid "An organizer is required."
 msgstr "Requírese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1725
-#: ../calendar/gui/dialogs/task-page.c:1119
+#: ../calendar/gui/dialogs/event-page.c:1732
+#: ../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:1931
+#: ../calendar/gui/dialogs/event-page.c:1938
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:1933
+#: ../calendar/gui/dialogs/event-page.c:1940
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:3451
+#: ../calendar/gui/dialogs/event-page.c:3458
 #, 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:3457
+#: ../calendar/gui/dialogs/event-page.c:3464
 #, 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:3463
+#: ../calendar/gui/dialogs/event-page.c:3470
 #, 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:3484
-msgid "Customize"
+#: ../calendar/gui/dialogs/event-page.c:3491
+msgid "Custom"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3491
+#: ../calendar/gui/dialogs/event-page.c:3498
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ningunha"
@@ -3321,6 +3583,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:356
 msgid "_Description:"
 msgstr "_Descrición:"
 
@@ -3343,7 +3607,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:547
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Atte_ndees..."
 msgstr "Participa_ntes…"
 
@@ -3351,10 +3615,6 @@ msgstr "Participa_ntes…"
 msgid "_Reminder"
 msgstr "_Recordatorio"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:31
-msgid "Custom Reminder:"
-msgstr "Recordatorio personalizado:"
-
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
 msgid "January"
 msgstr "Xaneiro"
@@ -3408,11 +3668,11 @@ msgid "Select Date"
 msgstr "Seleccionar unha data"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
 msgid "Select _Today"
 msgstr "Seleccionar o día de _hoxe"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
 msgid "Memo"
 msgstr "Nota"
 
@@ -3441,7 +3701,7 @@ msgstr ""
 #: ../em-format/e-mail-formatter-utils.c:218
 #: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
 #: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
-#: ../modules/mail/em-mailer-prefs.c:65
+#: ../modules/mail/em-mailer-prefs.c:64
 msgid "To"
 msgstr "Para"
 
@@ -3743,8 +4003,8 @@ msgstr "Notificar só aos participantes n_ovos"
 msgid "_Send Options"
 msgstr "Opción_s de envío"
 
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
-#: ../e-util/e-send-options.c:552
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Tarefa"
 
@@ -3780,27 +4040,27 @@ msgstr ""
 "Non é posíbel editar a tarefa porque a lista de tarefas seleccionada non "
 "admite asignación de tarefas"
 
-#: ../calendar/gui/dialogs/task-page.c:1011
+#: ../calendar/gui/dialogs/task-page.c:1013
 msgid "Due date is wrong"
 msgstr "A data de vencemento é incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1179
-#: ../calendar/gui/dialogs/task-page.c:1204
+#: ../calendar/gui/dialogs/task-page.c:1181
+#: ../calendar/gui/dialogs/task-page.c:1206
 msgid "Completed date is wrong"
 msgstr "A data de conclusión é incorrecta"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/e-cal-component-preview.c:338
+#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
 #: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
 msgid "High"
 msgstr "Alta"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-cal-model.c:1653 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
 #: ../mail/message-list.c:308
 msgid "Normal"
@@ -3808,48 +4068,48 @@ msgstr "Normal"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
+#: ../calendar/gui/e-cal-component-preview.c:342
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
 #: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
 msgid "Low"
 msgstr "Baixa"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Sen definir"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-component-preview.c:323
 #: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Non iniciada"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:313
 #: ../calendar/gui/e-cal-model-tasks.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3585
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3576
 msgid "In Progress"
 msgstr "En progreso"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-component-preview.c:316
 #: ../calendar/gui/e-cal-model-tasks.c:314
 #: ../calendar/gui/e-cal-model-tasks.c:556
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
@@ -3857,11 +4117,11 @@ msgstr "Completada"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:319
 #: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
-#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:958
 msgid "Canceled"
 msgstr "Cancelada"
 
@@ -3897,56 +4157,56 @@ msgstr "C_lasificación:"
 msgid "_Web Page:"
 msgstr "Páxina _Web:"
 
-#: ../calendar/gui/ea-cal-view.c:281
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New Appointment"
 msgstr "Nova cita"
 
-#: ../calendar/gui/ea-cal-view.c:282
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New All Day Event"
 msgstr "Nova actividade de día completo"
 
-#: ../calendar/gui/ea-cal-view.c:283
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "New Meeting"
 msgstr "Nova xuntanza"
 
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Today"
 msgstr "Ir ao día de hoxe"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../calendar/gui/ea-cal-view.c:288
 msgid "Go to Date"
 msgstr "Ir á data"
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:234
 msgid "It has reminders."
 msgstr "Ten recordatorios."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
 msgstr "Ten repeticións."
 
-#: ../calendar/gui/ea-cal-view-event.c:303
+#: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
 msgstr "É unha xuntanza."
 
-#: ../calendar/gui/ea-cal-view-event.c:310
+#: ../calendar/gui/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Actividade do calendario: o resumo é %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:313
+#: ../calendar/gui/ea-cal-view-event.c:250
 msgid "Calendar Event: It has no summary."
 msgstr "Actividade do calendario: non ten resumo."
 
-#: ../calendar/gui/ea-cal-view-event.c:336
+#: ../calendar/gui/ea-cal-view-event.c:273
 msgid "calendar view event"
 msgstr "vista de actividades do calendario"
 
-#: ../calendar/gui/ea-cal-view-event.c:568
+#: ../calendar/gui/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "Capturar o foco"
 
-#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3955,89 +4215,33 @@ msgstr[1] "Ten %d actividades."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:118 ../calendar/gui/ea-week-view.c:113
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
 msgid "It has no events."
 msgstr "Non ten actividades."
 
-#: ../calendar/gui/ea-day-view.c:126
+#: ../calendar/gui/ea-day-view.c:121
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vista de semana laboral: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:133
+#: ../calendar/gui/ea-day-view.c:128
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vista diaria: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:167
+#: ../calendar/gui/ea-day-view.c:157
 msgid "calendar view for a work week"
 msgstr "vista de calendario para unha semana laboral"
 
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:159
 msgid "calendar view for one or more days"
 msgstr "vista de calendario para un ou máis días"
 
 #: ../calendar/gui/ea-day-view-main-item.c:266
-#: ../calendar/gui/ea-week-view-main-item.c:293
+#: ../calendar/gui/ea-week-view-main-item.c:295
 msgid "a table to view and select the current time range"
 msgstr "unha táboa para ver e seleccionar o intervalo de tempo actual"
 
-#: ../calendar/gui/ea-gnome-calendar.c:47
-#: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1107
-msgid "Gnome Calendar"
-msgstr "Calendario do GNOME"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../modules/calendar/e-cal-shell-view-private.c:1190
-msgid "%A %d %b %Y"
-msgstr "%A, %d de %b de %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2796
-#: ../calendar/gui/e-day-view-top-item.c:858
-#: ../calendar/gui/e-week-view-main-item.c:218
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-msgid "%a %d %b"
-msgstr "%a, %d de %b"
-
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../calendar/gui/ea-gnome-calendar.c:222
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
-#: ../modules/calendar/e-cal-shell-view-private.c:1203
-#: ../modules/calendar/e-cal-shell-view-private.c:1206
-msgid "%a %d %b %Y"
-msgstr "%a, %d de %b de %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:249
-#: ../calendar/gui/ea-gnome-calendar.c:256
-#: ../calendar/gui/ea-gnome-calendar.c:259
-#: ../modules/calendar/e-cal-shell-view-private.c:1223
-#: ../modules/calendar/e-cal-shell-view-private.c:1234
-#: ../modules/calendar/e-cal-shell-view-private.c:1241
-#: ../modules/calendar/e-cal-shell-view-private.c:1244
-msgid "%d %b %Y"
-msgstr "%d de %b de %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2812
-#: ../calendar/gui/e-day-view-top-item.c:862
-#: ../calendar/gui/e-week-view-main-item.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1230
-msgid "%d %b"
-msgstr "%d de %b"
-
 #: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Botón de salto"
@@ -4047,7 +4251,7 @@ msgid "Click here, you can find more events."
 msgstr "Premer aquí para buscar máis actividades."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:357 ../calendar/gui/misc.c:97
+#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4055,84 +4259,84 @@ msgstr[0] "%d día"
 msgstr[1] "%d días"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:363
+#: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: ../calendar/gui/e-alarm-list.c:425
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Unknown action to be performed"
 msgstr "Descoñécese a acción a realizar"
 
-#: ../calendar/gui/e-alarm-list.c:440
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes do inicio da cita"
 
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:459
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s despois do inicio da cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ao inicio da cita"
 
-#: ../calendar/gui/e-alarm-list.c:465
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes de finalizar a cita"
 
-#: ../calendar/gui/e-alarm-list.c:471
+#: ../calendar/gui/e-alarm-list.c:484
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s despois de finalizar a cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ao finalizar a cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:515
 #, c-format
 msgid "%s at %s"
 msgstr "%s ás %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:510
+#: ../calendar/gui/e-alarm-list.c:523
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador descoñecido"
 
-#: ../calendar/gui/ea-week-view.c:119
+#: ../calendar/gui/ea-week-view.c:114
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vista mensual: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:124
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vista semanal: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:158
+#: ../calendar/gui/ea-week-view.c:148
 msgid "calendar view for a month"
 msgstr "vista de calendario para un mes"
 
-#: ../calendar/gui/ea-week-view.c:160
+#: ../calendar/gui/ea-week-view.c:150
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para unha ou máis semanas"
 
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:758
 #: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Sen título"
@@ -4141,52 +4345,55 @@ msgstr "Sen título"
 msgid "Categories:"
 msgstr "Categorías:"
 
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:273
 msgid "Start Date:"
 msgstr "Data de inicio:"
 
-#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-cal-component-preview.c:285
 msgid "End Date:"
 msgstr "Data de finalización:"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:297
 msgid "Due Date:"
 msgstr "Data de vencemento:"
 
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../modules/itip-formatter/itip-view.c:1506
-#: ../modules/itip-formatter/itip-view.c:1623
+#: ../calendar/gui/e-cal-component-preview.c:309
+#: ../modules/itip-formatter/itip-view.c:1496
+#: ../modules/itip-formatter/itip-view.c:1613
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:334
+#: ../calendar/gui/e-cal-component-preview.c:336
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-component-preview.c:359
-#: ../mail/e-mail-config-service-page.c:671
+#: ../calendar/gui/e-cal-component-preview.c:361
+#: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../calendar/gui/e-cal-component-preview.c:390
+#: ../calendar/gui/e-cal-component-preview.c:392
 msgid "Web Page:"
 msgstr "Páxina Web:"
 
-#: ../calendar/gui/e-calendar-selector.c:356
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../calendar/gui/e-cal-data-model.c:1503
 #, c-format
-msgid "Copying an event into the calendar %s"
-msgstr "Copiando un evento no calendario %s"
+msgid "Creating view for calendar '%s'"
+msgstr "Crear unha vista para o calendario «%s»"
 
-#: ../calendar/gui/e-calendar-selector.c:357
-#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#: ../calendar/gui/e-cal-data-model.c:1507
 #, c-format
-msgid "Moving an event into the calendar %s"
-msgstr "Movendo un evento no calendario %s"
+msgid "Creating view for task list '%s'"
+msgstr "Creando vistas para a lista de tarefas «%s»"
+
+#: ../calendar/gui/e-cal-data-model.c:1511
+#, c-format
+msgid "Creating view for memo list '%s'"
+msgstr "Creando unha vista para a lista de recordatorios «%s»"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
@@ -4201,7 +4408,7 @@ msgstr "Data de inicio"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:158
+#: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Tipo"
 
@@ -4209,7 +4416,7 @@ msgstr "Tipo"
 msgid "Completion date"
 msgstr "Data de conclusión"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
 msgid "Complete"
 msgstr "Completado"
 
@@ -4231,7 +4438,7 @@ 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:4011
+#: ../calendar/gui/e-cal-model.c:3098
 #: ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:33
@@ -4253,37 +4460,51 @@ msgstr "Creado"
 msgid "Last modified"
 msgstr "Última modificación"
 
-#: ../calendar/gui/e-calendar-view.c:448
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "Cortar as actividades seleccionadas para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:454
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar as actividades seleccionadas para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:460
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "Pegar as actividades desde o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:466
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "Eliminar as actividades seleccionadas"
 
-#: ../calendar/gui/e-calendar-view.c:486 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:269
-msgid "Deleting selected objects"
-msgstr "Eliminando os obxectos seleccionados"
+#: ../calendar/gui/e-calendar-view.c:810
+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:1538
+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:1541
+msgid "Default memo list not found"
+msgstr "Lista de recordatorios por omisión non atopada"
 
-#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:877
-#: ../calendar/gui/e-task-table.c:1175
-msgid "Updating objects"
-msgstr "Actualizando os obxectos"
+#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1544
+msgid "Default task list not found"
+msgstr "Lista de tarefas por omisión non atopada"
+
+#: ../calendar/gui/e-calendar-view.c:918
+msgid "No suitable component found"
+msgstr "Non se atopou un compoñente non axeitado"
+
+#: ../calendar/gui/e-calendar-view.c:988
+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:2094 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-calendar-view.c:1791 ../calendar/gui/e-memo-table.c:495
+#: ../calendar/gui/e-task-table.c:796
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
@@ -4291,25 +4512,65 @@ 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:2098 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:800
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2114
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
+#: ../calendar/gui/e-calendar-view.c:1811
+#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3527
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2145
+#: ../calendar/gui/e-calendar-view.c:1846
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
 
+#: ../calendar/gui/e-calendar-view.c:2222
+#: ../calendar/gui/e-calendar-view.c:2229
+#: ../calendar/gui/e-calendar-view.c:2236
+#: ../calendar/gui/e-calendar-view.c:2239
+msgid "%d %b %Y"
+msgstr "%d de %b de %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2227 ../calendar/gui/e-day-view.c:2939
+#: ../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:2249
+msgid "%A %d %b %Y"
+msgstr "%A, %d de %b de %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2253 ../calendar/gui/e-day-view.c:2923
+#: ../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:2256
+#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2265
+msgid "%a %d %b %Y"
+msgstr "%a, %d de %b de %Y"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
@@ -4319,77 +4580,99 @@ msgstr "Data de inicio"
 msgid "End Date"
 msgstr "Data de finalización"
 
-#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
 #: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3510
-#: ../modules/itip-formatter/itip-view.c:6097
+#: ../modules/itip-formatter/itip-view.c:3500
+#: ../modules/itip-formatter/itip-view.c:6087
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../calendar/gui/e-cal-model.c:1667
+#: ../calendar/gui/e-cal-model.c:1184 ../calendar/gui/e-cal-ops.c:586
+#: ../calendar/gui/e-cal-ops.c:1209
+#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#, c-format
+msgid "Source with UID '%s' not found"
+msgstr "A orixe con UID «%s» non se atopou"
+
+#: ../calendar/gui/e-cal-model.c:1268 ../calendar/gui/e-cal-ops.c:184
+#: ../calendar/gui/e-cal-ops.c:1325
+msgid "Creating an event"
+msgstr "Creando un evento"
+
+#: ../calendar/gui/e-cal-model.c:1272 ../calendar/gui/e-cal-ops.c:188
+#: ../calendar/gui/e-cal-ops.c:1329
+msgid "Creating a memo"
+msgstr "Creando un recordatorio"
+
+#: ../calendar/gui/e-cal-model.c:1276 ../calendar/gui/e-cal-ops.c:192
+#: ../calendar/gui/e-cal-ops.c:1333
+msgid "Creating a task"
+msgstr "Creando unha tarefa"
+
+#: ../calendar/gui/e-cal-model.c:1655
 msgid "Recurring"
 msgstr "Repetición"
 
-#: ../calendar/gui/e-cal-model.c:1669
+#: ../calendar/gui/e-cal-model.c:1657
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1659 ../calendar/gui/e-cal-model-tasks.c:1145
 #: ../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:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1659 ../calendar/gui/e-cal-model-tasks.c:1145
 #: ../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:3952
+#: ../calendar/gui/e-cal-model.c:3039
 #: ../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:6085
+#: ../modules/itip-formatter/itip-view.c:6075
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-cal-model.c:3953
+#: ../calendar/gui/e-cal-model.c:3040
 #: ../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:6091
+#: ../modules/itip-formatter/itip-view.c:6081
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-cal-model.c:3954
+#: ../calendar/gui/e-cal-model.c:3041
 #: ../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:527
+#: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-cal-model.c:3955
+#: ../calendar/gui/e-cal-model.c:3042
 #: ../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:6094
+#: ../modules/itip-formatter/itip-view.c:6084
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-cal-model.c:3956
+#: ../calendar/gui/e-cal-model.c:3043
 msgid "Needs action"
 msgstr "Necesita unha acción"
 
-#: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-cal-model-calendar.c:123
+#: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Libre"
 
-#: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:126
+#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -4409,17 +4692,183 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ningún"
 
+#: ../calendar/gui/e-cal-ops.c:283
+msgid "Modifying an event"
+msgstr "Modificando un evento"
+
+#: ../calendar/gui/e-cal-ops.c:287
+msgid "Modifying a memo"
+msgstr "Modificando un recordatorio"
+
+#: ../calendar/gui/e-cal-ops.c:291
+msgid "Modifying a task"
+msgstr "Modificando unha lista de tarefas"
+
+#: ../calendar/gui/e-cal-ops.c:387
+msgid "Removing an event"
+msgstr "Eliminando un evento"
+
+#: ../calendar/gui/e-cal-ops.c:391
+msgid "Removing a memo"
+msgstr "Eliminando un recordatorio"
+
+#: ../calendar/gui/e-cal-ops.c:395
+msgid "Removing a task"
+msgstr "Eliminando unha tarefa"
+
+#: ../calendar/gui/e-cal-ops.c:484
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "Updating an event"
+msgstr "Actualizando un evento"
+
+#: ../calendar/gui/e-cal-ops.c:824
+msgid "Updating a memo"
+msgstr "Actualizando un recordatorio"
+
+#: ../calendar/gui/e-cal-ops.c:828
+msgid "Updating a task"
+msgstr "Actualizando unha tarefa"
+
+#: ../calendar/gui/e-cal-ops.c:933
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "Purging events in the calendar '%s'"
+msgstr "Eliminando eventos no calendario «%s»"
+
+#: ../calendar/gui/e-cal-ops.c:966
+#, 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
+#, 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
+msgid "Purging events"
+msgstr "Eliminando eventos"
+
+#: ../calendar/gui/e-cal-ops.c:1072
+msgid "Purging memos"
+msgstr "Eliminando recordatorios"
+
+#: ../calendar/gui/e-cal-ops.c:1076
+msgid "Purging tasks"
+msgstr "Eliminando tarefas"
+
+#: ../calendar/gui/e-cal-ops.c:1178
+msgid "Expunging completed tasks"
+msgstr "Compactando tarefas completadas"
+
+#: ../calendar/gui/e-cal-ops.c:2032
+#, 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:2033
+#, 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:2039
+#, c-format
+msgid "Moving an memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "Movendo un recordatorio"
+msgstr[1] "Movendo %d recordatorios"
+
+#: ../calendar/gui/e-cal-ops.c:2040
+#, c-format
+msgid "Copying an memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "Copiando un recordatorio"
+msgstr[1] "Copiando %d recordatorios"
+
+#: ../calendar/gui/e-cal-ops.c:2046
+#, c-format
+msgid "Moving an task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "Movendo unha tarefa"
+msgstr[1] "Movendo %d tarefas"
+
+#: ../calendar/gui/e-cal-ops.c:2047
+#, c-format
+msgid "Copying an task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "Copiando unha tarefa"
+msgstr[1] "Copiando %d tarefas"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:158
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:161
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:169
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4429,16 +4878,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1540
+#: ../calendar/gui/e-day-view.c:2057 ../calendar/gui/e-week-view.c:1690
 #: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
+#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1989 ../calendar/gui/e-week-view.c:1543
+#: ../calendar/gui/e-day-view.c:2060 ../calendar/gui/e-week-view.c:1693
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
 msgstr "pm"
 
@@ -4448,13 +4897,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:2779 ../calendar/gui/e-day-view-top-item.c:854
-#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:2906 ../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:3443
+#: ../calendar/gui/e-day-view.c:3570
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -4465,17 +4914,17 @@ 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:800
+#: ../calendar/gui/e-day-view-time-item.c:802
 #, c-format
 msgid "%02i minute divisions"
 msgstr "divisións de %02i minutos"
 
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:827
 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:842
+#: ../calendar/gui/e-day-view-time-item.c:844
 #: ../modules/calendar/e-calendar-preferences.c:305
 #: ../modules/calendar/e-calendar-preferences.c:357
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
@@ -4483,7 +4932,7 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ningunha"
 
-#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-day-view-time-item.c:878
 #: ../calendar/gui/e-timezone-entry.c:323
 #: ../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
@@ -4590,67 +5039,67 @@ msgstr "Razón do fallo: %s"
 msgid "Enter password"
 msgstr "Introduza o contrasinal"
 
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "Out of Office"
 msgstr "Ausente da oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:533
 msgid "No Information"
 msgstr "Sen información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:588
 msgid "Show _only working hours"
 msgstr "Mostrar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:601
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "_Update free/busy"
 msgstr "Act_ualizar a dispoñibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:636
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:654
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "Seleccionar _automaticamente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:673
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:694
 msgid "_All people and resources"
 msgstr "Tod_as as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "Persoas necesa_rias"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:726
 msgid "Required people and _one resource"
 msgstr "Pers_oas necesarias e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:763
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:792
+#: ../calendar/gui/e-meeting-time-sel.c:794
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2660
+#: ../calendar/gui/e-meeting-time-sel.c:2659
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4659,7 +5108,7 @@ msgstr ""
 "Resumo: %s\n"
 "Localización: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
+#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
@@ -4688,46 +5137,46 @@ msgstr "Nome común"
 msgid "Language"
 msgstr "Idioma"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:481
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../calendar/gui/e-memo-table.c:371
+#: ../modules/calendar/e-cal-shell-content.c:1573
+#: ../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:306
 msgid "Memos"
 msgstr "Notas"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
 msgid "* No Summary *"
 msgstr "* Sen resumo *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
+#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
 msgid "Start: "
 msgstr "Inicio: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
+#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
 msgid "Due: "
 msgstr "Vencemento: "
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:684
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar as notas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:747
+#: ../calendar/gui/e-memo-table.c:690
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar as notas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:753
+#: ../calendar/gui/e-memo-table.c:696
 msgid "Paste memos from the clipboard"
 msgstr "Pegar as notas desde o portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:759
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../calendar/gui/e-memo-table.c:702
+#: ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "Eliminar as notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:765
+#: ../calendar/gui/e-memo-table.c:708
 msgid "Select all visible memos"
 msgstr "Seleccionar todas as notas visíbeis"
 
@@ -4739,40 +5188,40 @@ msgstr "Prema para engadir unha nota"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
 #: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1071
+#: ../calendar/importers/icalendar-importer.c:1072
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:438
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../modules/calendar/e-cal-shell-content.c:1531
+#: ../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:465
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../calendar/gui/e-task-table.c:1039
+#: ../calendar/gui/e-task-table.c:999
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cortar as tarefas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:1045
+#: ../calendar/gui/e-task-table.c:1005
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar as tarefas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:1051
+#: ../calendar/gui/e-task-table.c:1011
 msgid "Paste tasks from the clipboard"
 msgstr "Pegar as tarefas desde o portapapeis"
 
-#: ../calendar/gui/e-task-table.c:1057
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../calendar/gui/e-task-table.c:1017
+#: ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr "Eliminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-task-table.c:1023
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas as tarefas visíbeis"
 
@@ -4784,14 +5233,10 @@ msgstr "Seleccionar un fuso horario"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:226 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2371
-msgid "Purging"
-msgstr "Purgando"
-
 #: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
 #: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
@@ -4901,142 +5346,154 @@ msgstr "Información de dispoñibilidade (de %s a %s)"
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1147
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Non foi posíbel reservar un recurso, a nova actividade colisiona con algunha "
 "outra."
 
-#: ../calendar/gui/itip-utils.c:1155
-#, c-format
-msgid "Unable to book a resource, error: %s"
-msgstr "Non foi posíbel reservar un recurso, erro: %s"
+#: ../calendar/gui/itip-utils.c:1153
+msgid "Unable to book a resource, error: "
+msgstr "Non foi posíbel reservar un recurso, erro:"
 
-#: ../calendar/gui/itip-utils.c:1327
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante na actividade."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/itip-utils.c:1917
+msgid "Sending an event"
+msgstr "Enviando un evento"
+
+#: ../calendar/gui/itip-utils.c:1921
+msgid "Sending a memo"
+msgstr "Enviando un recordatorio"
+
+#: ../calendar/gui/itip-utils.c:1925
+msgid "Sending a task"
+msgstr "Enviando unha tarefa"
+
+#: ../calendar/gui/print.c:664
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:670
 msgid "31st"
 msgstr "31"
 
@@ -5044,102 +5501,102 @@ msgstr "31"
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:726
+#: ../calendar/gui/print.c:730
 msgid "Mo"
 msgstr "Lu"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:731
 msgid "Tu"
 msgstr "Ma"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:732
 msgid "We"
 msgstr "Mé"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:733
 msgid "Th"
 msgstr "Xo"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:734
 msgid "Fr"
 msgstr "Ve"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:735
 msgid "Sa"
 msgstr "Sá"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:736
 msgid "Su"
 msgstr "Do"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3319
+#: ../calendar/gui/print.c:3309
 msgid " to "
 msgstr " para "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3329
+#: ../calendar/gui/print.c:3319
 msgid " (Completed "
 msgstr " (Completado "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3325
 msgid "Completed "
 msgstr "Completado "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3345
+#: ../calendar/gui/print.c:3335
 msgid " (Due "
 msgstr " (Vencemento "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3352
+#: ../calendar/gui/print.c:3342
 msgid "Due "
 msgstr "Vencemento "
 
-#: ../calendar/gui/print.c:3555
+#: ../calendar/gui/print.c:3546
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:3599
+#: ../calendar/gui/print.c:3590
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:3615
+#: ../calendar/gui/print.c:3606
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:3647
+#: ../calendar/gui/print.c:3638
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3661
+#: ../calendar/gui/print.c:3652
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:3672
+#: ../calendar/gui/print.c:3663
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -5166,177 +5623,181 @@ msgstr "é menor que"
 msgid "Appointments and Meetings"
 msgstr "Citas e reunións"
 
-#: ../calendar/importers/icalendar-importer.c:461
-#: ../calendar/importers/icalendar-importer.c:900
+#: ../calendar/importers/icalendar-importer.c:462
+#: ../calendar/importers/icalendar-importer.c:901
 msgid "Opening calendar"
 msgstr "Abrindo o calendario"
 
-#: ../calendar/importers/icalendar-importer.c:609
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "iCalendar files (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:703
 msgid "Reminder!"
 msgstr "Aviso"
 
-#: ../calendar/importers/icalendar-importer.c:786
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "vCalendar files (.vcs)"
 msgstr "Ficheiros vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:1064
+#: ../calendar/importers/icalendar-importer.c:1065
 msgid "Calendar Events"
 msgstr "Actividades do calendario"
 
 #: ../calendar/importers/icalendar-importer.c:1108
+msgid "Gnome Calendar"
+msgstr "Calendario do GNOME"
+
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intelixente do calendario do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Reunión"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Actividade"
 
-#: ../calendar/importers/icalendar-importer.c:1182
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1183
+#: ../calendar/importers/icalendar-importer.c:1495
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/importers/icalendar-importer.c:1185
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1496
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/importers/icalendar-importer.c:1194
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ten repeticións"
 
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "é unha instancia"
 
-#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1205
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "Ten recordatorios"
 
-#: ../calendar/importers/icalendar-importer.c:1209
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ten anexos"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1222
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Público"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1226
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privado"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidencial"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Clasificación"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1237
-#: ../calendar/importers/icalendar-importer.c:1537
+#: ../calendar/importers/icalendar-importer.c:1238
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Resumo"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Localización"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1251
-#: ../calendar/importers/icalendar-importer.c:1532
+#: ../calendar/importers/icalendar-importer.c:1252
+#: ../calendar/importers/icalendar-importer.c:1533
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Inicio"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1262
+#: ../calendar/importers/icalendar-importer.c:1263
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Vencemento"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Final"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1285
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Categorías"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1309
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completada"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1316
+#: ../calendar/importers/icalendar-importer.c:1317
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1327
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1328
+#: ../calendar/importers/icalendar-importer.c:1331
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizador"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1350
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../calendar/importers/icalendar-importer.c:1351
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/importers/icalendar-importer.c:1367
+#: ../calendar/importers/icalendar-importer.c:1368
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Descrición"
 
-#: ../calendar/importers/icalendar-importer.c:1527
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tipo"
@@ -6892,147 +7353,152 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: ../composer/e-composer-actions.c:202
+#: ../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
 msgid "Save as..."
 msgstr "Gardar como…"
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:362
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:367
 msgid "New _Message"
 msgstr "_Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:369
 msgid "Open New Message window"
 msgstr "Abrir unha xanela de mensaxe nova"
 
-#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
+#: ../composer/e-composer-actions.c:374 ../shell/e-shell-window-actions.c:979
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
+#: ../composer/e-composer-actions.c:376 ../shell/e-shell-window-actions.c:981
 msgid "Configure Evolution"
 msgstr "Configurar o Evolution"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:383
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:388
 msgid "Save _As..."
 msgstr "Gardar _como…"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:390
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual con un nome diferente"
 
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:397
 msgid "Character _Encoding"
 msgstr "C_odificación de caracteres"
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:421
 msgid "Print Pre_view"
 msgstr "_Vista previa de impresión"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:428
 msgid "Save as _Draft"
 msgstr "Gardar como borra_dor"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:430
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:435
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:437
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:445
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:447
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:453
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:455
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa súa chave PGP"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:461
 msgid "_Picture Gallery"
 msgstr "_Galería de imaxes"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:463
 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:384
+#: ../composer/e-composer-actions.c:469
 msgid "_Prioritize Message"
 msgstr "_Priorizar a mensaxe"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:471
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:477
 msgid "Re_quest Read Receipt"
 msgstr "_Solicitar a confirmación de lectura"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:479
 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:400
+#: ../composer/e-composer-actions.c:485
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:487
 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:408
+#: ../composer/e-composer-actions.c:493
 msgid "S/MIME Sig_n"
 msgstr "Asi_nar con S/MIME"
 
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:495
 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:416
+#: ../composer/e-composer-actions.c:501
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:418
+#: ../composer/e-composer-actions.c:503
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna a vista do campo «CCO»"
 
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:509
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:426
+#: ../composer/e-composer-actions.c:511
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna a vista do campo «CC»"
 
-#: ../composer/e-composer-actions.c:432
+#: ../composer/e-composer-actions.c:517
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:519
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna a vista do campo «Responder a»"
 
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:579
 msgid "Save Draft"
 msgstr "Gardar o borrador"
 
@@ -7052,48 +7518,48 @@ msgstr ""
 "Introducir os enderezos que recibirán unha copia da mensaxe sen aparecerer "
 "na lista de destinatarios"
 
-#: ../composer/e-composer-header-table.c:771
+#: ../composer/e-composer-header-table.c:770
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:778
+#: ../composer/e-composer-header-table.c:777
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:783
+#: ../composer/e-composer-header-table.c:782
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:789
+#: ../composer/e-composer-header-table.c:788
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:795
+#: ../composer/e-composer-header-table.c:794
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:799
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:804
+#: ../composer/e-composer-header-table.c:803
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:812
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../composer/e-composer-header-table.c:811
+#: ../mail/e-mail-config-identity-page.c:487
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
-#: ../composer/e-composer-name-header.c:234
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Premer aquí para ir á axenda de enderezos"
 
-#: ../composer/e-composer-post-header.c:183
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr "Premer aquí para seleccionar os cartafoles de destino"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:858
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7101,7 +7567,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:888
+#: ../composer/e-msg-composer.c:867
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7110,19 +7576,15 @@ msgstr ""
 "Non é posíbel cifrar a mensaxe saínte: non hai un certificado de cifrado "
 "estabelecido para esta conta"
 
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
+#: ../composer/e-msg-composer.c:1632 ../composer/e-msg-composer.c:2190
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4243
+#: ../composer/e-msg-composer.c:4406
 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."
 
-#: ../composer/e-msg-composer.c:4943
-msgid "Untitled Message"
-msgstr "Mensaxe sen título"
-
 #: ../composer/mail-composer.error.xml.h:1
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "Non pode anexar o ficheiro «{0}» a esta mensaxe."
@@ -7208,70 +7670,74 @@ msgid "_Save Draft"
 msgstr "_Gardar o borrador"
 
 #: ../composer/mail-composer.error.xml.h:20
+msgid "Are you sure you want to discard the message you are composing?"
+msgstr "Está seguro de que desexa rexeitar a mensaxe que está redactando?"
+
+#: ../composer/mail-composer.error.xml.h:21
 msgid "Could not create message."
 msgstr "Non foi posíbel crear a mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 "Debido a «{0}», quizais necesite seleccionar diferentes opcións de correo."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "Non foi posíbel ler o ficheiro da sinatura «{0}»."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:24
 msgid "All accounts have been removed."
 msgstr "Retiráronse todas as contas."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "Necesita configurar unha conta antes de poder escribir un correo."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:26
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Produciuse un erro ao gardar no cartafol de saída."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:27
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "O erro devolto foi «{0}». Non se enviou a mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:28
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Produciuse un erro ao gardar no cartafol dos borradores."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
 msgstr "O erro devolto foi «{0}». É moi posíbel que non se gardase a mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 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:30 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:161
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "O informe de erro foi «{0}»."
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save to Outbox"
 msgstr "Gardar na caixa de _saída"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Try Again"
 msgstr "Tentar outra vez"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:34
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr ""
 "A súa mensaxe foi enviada, porén produciuse un erro durante o post-procesado."
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
 msgid "Saving message to Outbox."
 msgstr "Gardando a mensaxe no cartafol de saída."
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:36
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -7281,6 +7747,19 @@ msgstr ""
 "está dispoñíbel actualmente. Pode enviar o mensaxe premendo no botón «Enviar/"
 "Recibir» da barra de ferramentas de Evolution."
 
+#: ../composer/mail-composer.error.xml.h:37
+msgid "Are you sure you want to send the message?"
+msgstr "Está seguro de que desexa enviar o mensaxe?"
+
+#: ../composer/mail-composer.error.xml.h:38
+msgid ""
+"A keyboard accelerator to send the message had been pressed. Either cancel "
+"message send, if it was done by an accident, or send the message."
+msgstr ""
+"Premeuse un acelerador de teclado para enviar un mensaxe. Pode cancelar o "
+"envío do mensaxe, no caso de que fora premido por accidente, ou enviar o "
+"mensaxe."
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Notificador de alarmas do Evolution"
@@ -7289,28 +7768,6 @@ msgstr "Notificador de alarmas do Evolution"
 msgid "Calendar event notifications"
 msgstr "Notificacións de actividades do calendario"
 
-#: ../data/evolution.appdata.xml.in.h:1
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolution é un aplicativo de xestión de información persoal que lle fornece "
-"funcionalidades integradas de correo electrónico, calendario e axenda de "
-"enderezos."
-
-#: ../data/evolution.appdata.xml.in.h:2
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr ""
-"Evolution admite un amplo conxunto de formatos de datos estándar na "
-"industria e protocolos estándares de intercambio de información, xa que lle "
-"fornece un gran apoio ao cumplimento de estándares e seguridade. Evolution "
-"tamén pode integrarse perfectamente con Microsoft Exchange empregando a "
-"extensión \"Exchange Web Services\" (EWS)."
-
 #: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
@@ -7443,6 +7900,51 @@ msgstr "Mostrar o panel de vista previa"
 msgid "Whether to show the preview pane."
 msgstr "Indica se mostrar o panel de vista previa."
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr "verdadeiro"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+msgid "Whether to show phone numbers in the editor"
+msgstr "Indica se se mostra o campo de números de teléfono no editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+msgid "Whether to show SIP addresses in the editor"
+msgstr "Indica se se mostra o campo de enderezo SIP no editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+msgid "Whether to show IM addresses in the editor"
+msgstr "Indica se se mostra o campo de enderezos IM no editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr ""
+"Indica se se mostra o campo de enderezos de correo particulares no editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "Indica se se mostra o campo de correo de traballo no editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "Indica se se mostra o campo de outros enderezos de correo no editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+msgid "Whether to show Web Addresses in the editor"
+msgstr "Indica se se mostra o campo de enderezos web no editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+msgid "Whether to show job information in the editor"
+msgstr "Indica se se mostra o campo de información de traballo no editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "Indica se se mostra o campo de información varia no editor"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+msgid "Whether to show notes in the editor"
+msgstr "Indica se se mostra os notas 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"
@@ -8334,30 +8836,20 @@ msgid "Send HTML mail by default."
 msgstr "Enviar o correo en HTML de forma predeterminada."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Spell checking color"
-msgstr "Cor da comprobación ortográfica"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
-"Cor de subliñado para as palabras escritas incorrectamente cando se usa a "
-"corrección ortográfica en liña."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Spell checking languages"
 msgstr "Idiomas para a comprobación ortográfica"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista dos códigos de idioma dos dicionarios usados para a comprobación "
 "ortográfica."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar o campo «Cco» ao enviar unha mensaxe de correo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8365,11 +8857,11 @@ msgstr ""
 "Mostrar o campo «Cco» ao enviar unha mensaxe de correo. Isto pódese "
 "configurar no menú «Vista» cando se selecciona unha conta de correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostrar o campo «Cc» ao enviar unha mensaxe de correo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8377,11 +8869,11 @@ msgstr ""
 "Mostrar o campo «Cc» ao enviar unha mensaxe de correo. Isto pódese "
 "configurar no menú «Vista» cando se selecciona unha conta de correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostrar o campo «Respostar a» ao enviar unha mensaxe de correo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8389,11 +8881,11 @@ msgstr ""
 "Mostrar o campo «Responder a» ao enviar unha mensaxe de correo. Isto pódese "
 "configurar no menú «Vista» cando se selecciona unha conta de correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar o campo «De» ao enviar unha mensaxe a un grupo de discusión"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -8401,12 +8893,12 @@ msgstr ""
 "Mostrar o campo «De» ao enviar unha mensaxe a un grupo de discusión. Isto "
 "pódese configurar no menú «Vista» cando se selecciona unha conta de novas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 "Mostrar o campo «Respostar a» ao enviar unha mensaxe a un grupo de discusión"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -8415,11 +8907,11 @@ msgstr ""
 "discusión. Isto pódese configurar no menú «Vista» cando se selecciona unha "
 "conta de novas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Digitally sign replies when the original message is signed"
 msgstr "Firmar dixitalmente respostas cando a mensaxe orixinal estea firmada"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -8427,11 +8919,11 @@ msgstr ""
 "Activar as firmas PGP ou S/MIME automaticamente ao responder a unha mensaxe "
 "firmada con PGP ou S/MIME."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Codificar nomes de ficheiro da forma Outlook/GMail"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8443,6 +8935,18 @@ msgstr ""
 "UTF-8 enviados por Evolution, porque estes non seguen a RFC 2231 senón que "
 "usan un estándar RFC 2047 incorrecto."
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+msgid "Send messages through Outbox folder"
+msgstr "Enviando mensaxes mediante o cartafol Caixa de saída"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr ""
+"Sempre gardar os mensaxes no cartafol de Caixa de saída ao enviar, para "
+"permitirlle a un usuario escoller onde se deberían enviar os mensaxes."
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Put personalized signatures at the top of replies"
 msgstr "Poñer sinaturas personalizadas no inicio das respostas"
@@ -8508,18 +9012,37 @@ msgstr ""
 "estándar «Re». Un exemplo é «SV, AV»."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+msgid "Enable developer mode"
+msgstr "Activar o modo de desenvolvedor"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid ""
+"Enables some hidden actions and tools aimed for development and debugging."
+msgstr ""
+"Activar algunhas accións e ferramentas ocultas enfocadas no desenvolvemento "
+"e depuración."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Number of characters for wrapping"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid "Will autowrap lines after given number of characters."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 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:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Pode ser «mbox» ou «pdf»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Show image animations"
 msgstr "Mostrar as imaxes animadas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8527,11 +9050,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:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 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:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8539,11 +9062,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:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 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:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8551,75 +9074,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:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 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:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 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:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 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:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 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:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Citation highlight color"
 msgstr "Cor de realce das citas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Citation highlight color."
 msgstr "Cor de realce das citas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo de cursor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 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:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 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:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 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:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 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:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Show Animations"
 msgstr "Mostrar as animacións"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animacións."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show all message headers"
 msgstr "Mostrar todas as cabeceiras das mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 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:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 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:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 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 "
@@ -8630,42 +9153,50 @@ 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:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Show photo of the sender"
 msgstr "Mostrar a fotografía do remitente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 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:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+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:85
+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:86
 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:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 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:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 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:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 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:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 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:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 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:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -8673,7 +9204,7 @@ 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:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8681,19 +9212,19 @@ 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:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 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:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 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:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Enable Unmatched search folder"
 msgstr "Activar o cartafol de busca non coincidente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8701,11 +9232,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:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 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:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 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."
@@ -8713,32 +9244,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:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Height of the message-list pane"
 msgstr "Altura do panel da lista de mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Height of the message-list pane."
 msgstr "Altura do panel da lista de mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 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:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Width of the message-list pane"
 msgstr "Largura do panel da lista de mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Width of the message-list pane."
 msgstr "Largura do panel da lista de mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Layout style"
 msgstr "Estilo da disposición"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 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 "
@@ -8750,46 +9281,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:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Variable width font"
 msgstr "Tipo de letra de largura variábel"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 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:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 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:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Use custom fonts"
 msgstr "Usar tipos de letra personalizados"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 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:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 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:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 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:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 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:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8797,11 +9328,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:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 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:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8809,11 +9340,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:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 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:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8821,11 +9352,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:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 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:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 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 "
@@ -8834,11 +9365,11 @@ 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:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 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:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 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 "
@@ -8850,27 +9381,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:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Log filter actions"
 msgstr "Rexistrar as accións de filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 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:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Flush Outbox after filtering"
 msgstr "Limpar a caixa de saída despois do filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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 "
@@ -8881,46 +9412,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:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Default forward style"
 msgstr "Estilo de reencamiñamento predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Default reply style"
 msgstr "Estilo de resposta predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+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:134
+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:135
 msgid "Prompt on empty subject"
 msgstr "Avisar cando o «Asunto» estea baleiro"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when emptying the trash"
 msgstr "Avisar ao baleirar o lixo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 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:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt when user expunges"
 msgstr "Avisar cando o usuario expurgue"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 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:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -8928,32 +9470,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:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 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:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 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:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 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:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 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:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -8961,19 +9503,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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt while marking multiple messages"
 msgstr "Avisar cando se marquen varias mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 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:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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 "
@@ -8983,13 +9525,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:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 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:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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 "
@@ -9001,13 +9543,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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 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:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 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 "
@@ -9019,11 +9561,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:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 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:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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."
@@ -9031,11 +9573,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:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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 "
@@ -9046,11 +9588,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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when replying to many recipients"
 msgstr "Avisar ao responder a moitos destinatarios"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -9058,7 +9600,7 @@ 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -9066,43 +9608,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:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Empty Trash folders on exit"
 msgstr "Baleirar os cartafoles de lixo ao saír"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 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:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 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:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 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:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9110,11 +9652,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:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar o valor orixinal da cabeceira «Data»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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 "
@@ -9124,11 +9666,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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas coas cores asociadas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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."
@@ -9137,46 +9679,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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Check incoming mail being junk"
 msgstr "Comprobar se o correo entrante é correo lixo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 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:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 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:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 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:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 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:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 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:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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 "
@@ -9186,13 +9728,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:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 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:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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 "
@@ -9205,7 +9747,7 @@ msgstr ""
 "enderezos remotas (LDAP, por exemplo) están marcadas para o completado "
 "automático."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9213,7 +9755,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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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 "
@@ -9224,13 +9766,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:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 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:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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 "
@@ -9240,11 +9782,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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 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:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9252,31 +9794,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:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "UID string of the default account."
 msgstr "Cadea UID para a conta predeterminada."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Save directory"
 msgstr "Cartafol onde gardar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 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:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Composer load/attach directory"
 msgstr "Cartafol para cargar/anexar do editor de mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 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:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Check for new messages on start"
 msgstr "Comprobar se hai mensaxes novas ao iniciar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9284,11 +9826,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:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 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 "
@@ -9299,11 +9841,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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronización do servidor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9311,11 +9853,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:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "(Deprecated) Default forward style"
 msgstr "(Obsoleto) Estilo de reencamiñamento predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9323,11 +9865,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:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid "(Deprecated) Default reply style"
 msgstr "(Obsoleto) Estilo de resposta predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9335,12 +9877,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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9348,11 +9890,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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -9360,7 +9902,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:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9368,7 +9910,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:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9679,7 +10221,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:307
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:306
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexión"
 
@@ -9776,8 +10318,8 @@ msgid "Use only the local spam tests (no DNS)."
 msgstr "Usar só as probas locais de correo lixo (sen DNS)."
 
 #: ../em-format/e-mail-formatter-attachment.c:405
-#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
-#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -9797,8 +10339,8 @@ msgid "Play the attachment in embedded audio player"
 msgstr "Reproducir o anexo nun reprodutor de audio incrustado"
 
 #: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
 msgid "From"
 msgstr "De"
 
@@ -9830,7 +10372,7 @@ 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:1322
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1271
 #: ../modules/cal-config-google/e-google-chooser.c:236
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
@@ -9858,24 +10400,24 @@ msgid "S/MIME encrpyted"
 msgstr "Cifrado con S/MIME"
 
 #: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../mail/e-mail-config-security-page.c:734
+#: ../mail/e-mail-config-security-page.c:736
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
 msgid "Security"
 msgstr "Seguranza"
 
 #: ../em-format/e-mail-formatter-quote-headers.c:167
-#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:278
+#: ../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:68
+#: ../modules/mail/em-mailer-prefs.c:67
 msgid "Subject"
 msgstr "Titular"
 
 #. pseudo-header
 #: ../em-format/e-mail-formatter-quote-headers.c:186
 #: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../modules/mail/em-mailer-prefs.c:1154
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
@@ -9899,12 +10441,13 @@ msgstr "HTML"
 msgid "Format part as HTML"
 msgstr "Formatar parte como HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:197
+#: ../e-util/e-html-editor-actions.c:1382
 msgid "Plain Text"
 msgstr "Texto plano"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../em-format/e-mail-formatter-quote-text-plain.c:124
 #: ../em-format/e-mail-formatter-text-plain.c:198
 msgid "Format part as plain text"
 msgstr "Formatar parte como texto plano"
@@ -10039,13 +10582,13 @@ msgstr "Mostrar fonte como parte MIME"
 
 #: ../em-format/e-mail-formatter-utils.c:202
 #: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:66
+#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/e-mail-formatter-utils.c:203
 #: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
 msgid "Bcc"
 msgstr "Cco"
 
@@ -10059,12 +10602,12 @@ msgstr "Produciuse un erro ao analizar a parte MBOX: %s"
 msgid "Could not parse S/MIME message: %s"
 msgstr "Non foi posíbel analizar a mensaxe S/MIME: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Non foi posíbel analizar a mensaxe PGP: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
 #: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
@@ -10117,21 +10660,21 @@ msgstr "Non foi posíbel analizar a mensaxe PGP/MIME: %s"
 msgid "Unsupported signature format"
 msgstr "O formato da sinatura non é compatíbel"
 
-#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
 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
-#: ../modules/mail/em-mailer-prefs.c:69
+#: ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
 msgid "Newsgroups"
 msgstr "Grupos de discusión"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Cara"
@@ -10141,334 +10684,18 @@ msgstr "Cara"
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Estándar"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Propietario"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Secreto"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Alto secreto"
-
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "Só para os seus ollos"
-
-#. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "Ningún"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Destinatario do correo"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "R_esposta solicitada"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "Den_tro"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "días"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "_Cando sexa conveniente"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
-msgid "Replies"
-msgstr "Respostas"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "_Atrasar a entrega da mensaxe"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_Despois"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "días"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "_Estabelecer a data de vencemento"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Até"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Opcións de entrega"
-
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "_Prioridade:"
-
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "_Clasificación:"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Opcións _xerais"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "Cr_ear un elemento enviado para seguir a información"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "_Entregada"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "_Entregado e aberto"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "Toda _a información"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "Eliminar a_utomaticamente o elemento enviado"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Seguimento de estado"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "_Ao abrir:"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "Ao _rexeitar:"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "Ao co_mpletar:"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "Ao ace_ptar:"
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Devolver notificación"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "Seguimento de es_tado"
-
-#: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
-msgid "_Apply"
-msgstr "_Aplicar"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "_Ordenar…"
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "_Agrupar por…"
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "_Campos mostrados…"
-
-#: ../e-util/e-table-config.ui.h:9
-msgid "Clear _All"
-msgstr "Limp_ar todo"
-
-#: ../e-util/e-table-config.ui.h:10
-msgid "_Show field in View"
-msgstr "Mo_strar o campo na vista"
-
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1753
-msgid "Ascending"
-msgstr "Ascendente"
-
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
-msgid "Descending"
-msgstr "Descendente"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Group Items By"
-msgstr "Agrupar os elementos por"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show _field in View"
-msgstr "M_ostrar o campo na vista"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Then By"
-msgstr "Despois por"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field i_n View"
-msgstr "Mos_trar o campo na vista"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Show field in _View"
-msgstr "Mostrar o campo na _visualización"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Ordenar"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Clear All"
-msgstr "Limpar todo"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Sort Items By"
-msgstr "Ordenar os elementos por"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Seleccionar un fuso horario"
-
-#: ../e-util/e-timezone-dialog.ui.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Usar o botón esquerdo do rato para ampliar unha zona do mapa e escoller un "
-"fuso horario.\n"
-"Use o botón dereito para reducir."
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Time Zones"
-msgstr "Fusos horarios"
-
-#: ../e-util/e-timezone-dialog.ui.h:7
-msgid "_Selection"
-msgstr "_Selección"
-
-#: ../e-util/e-timezone-dialog.ui.h:8
-msgid "Timezone drop-down combination box"
-msgstr "Caixa de combinación despregábel para o fuso horario"
-
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
-#: ../mail/em-utils.c:229
-msgid "Incoming"
-msgstr "Entrante"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "o instante actual"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "o instante que indique"
-
-#: ../e-util/filter.ui.h:4
-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:83
-msgid "seconds"
-msgstr "segundos"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "semanas"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "meses"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "anos"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "hai"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "no futuro"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Mostrar os filtros para o correo:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "Regras de _filtro"
-
-#: ../e-util/filter.ui.h:23
-msgid "Compare against"
-msgstr "Comparar con"
-
-#: ../e-util/filter.ui.h:24
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"A data da mensaxe compararase co\n"
-"instante actual no que se produce o filtrado."
-
-#: ../e-util/filter.ui.h:26
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"A data da mensaxe compararase coas\n"
-"12:00am da data indicada."
-
-#: ../e-util/filter.ui.h:28
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"A data da mensaxe compararase co\n"
-"instante relativo no que se produce o filtrado."
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Crear unha vista nova"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:416
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:340
-msgid "_Name:"
-msgstr "_Nome:"
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+msgid "%d %B %Y"
+msgstr "%d de %B de %Y"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "Substituí_r a vista existente"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Calendario: desde %s até %s"
 
-#: ../e-util/e-activity-proxy.c:308
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "elemento de calendario do Evolution"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:258
@@ -10505,19 +10732,89 @@ msgstr "%s"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
+#: ../e-util/e-activity-proxy.c:313
+#: ../modules/mail/e-mail-shell-view-actions.c:1817
+msgid "Cancel"
+msgstr "Cancelar"
+
 #. Translators: Escape is a keyboard binding.
 #: ../e-util/e-alert-bar.c:118
 msgid "Close this message (Escape)"
 msgstr "Pechar esta mensaxe (Escape)"
 
-#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
+#: ../e-util/e-alert-sink.c:246
+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:703
 msgid "Icon View"
 msgstr "Vista de iconas"
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
 msgid "List View"
 msgstr "Vista de lista"
 
+# (pofilter) variables: (u'translation contains variables not in original: %d',)
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../e-util/e-attachment.c:1197
+msgid "Attached message"
+msgstr "Mensaxe anexada"
+
+#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+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:690
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+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
+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
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Non foi posíbel cargar «%s»"
+
+#: ../e-util/e-attachment.c:2476
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Non foi posíbel cargar o anexo"
+
+#: ../e-util/e-attachment.c:2761
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Non foi posíbel abrir «%s»"
+
+#: ../e-util/e-attachment.c:2764
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Non foi posíbel abrir o anexo"
+
+#: ../e-util/e-attachment.c:3411
+msgid "Attachment contents not loaded"
+msgstr "Non se cargaron os contidos do anexo"
+
+#: ../e-util/e-attachment.c:3502
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Non foi posíbel gardar «%s»"
+
+#: ../e-util/e-attachment.c:3505
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Non foi posíbel gardar o anexo"
+
 #: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "Propiedades dos anexos"
@@ -10530,7 +10827,7 @@ msgstr "Nome do f_icheiro:"
 msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:520
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suxerir automaticamente a vista do anexo"
 
@@ -10542,43 +10839,53 @@ msgstr "Non foi posíbel definir como fondo"
 msgid "Set as _Background"
 msgstr "Estabelecer como _fondo"
 
-#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-icon-view.c:168
 #: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "Cargando"
 
-#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-icon-view.c:180
 #: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "Gardando"
 
-#: ../e-util/e-attachment-paned.c:103
+#: ../e-util/e-attachment-paned.c:104
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
+#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
 msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../e-util/e-attachment-store.c:462
+#: ../e-util/e-attachment-store.c:485
 msgid "Add Attachment"
 msgstr "Engadir un anexo"
 
-#: ../e-util/e-attachment-store.c:465
+#: ../e-util/e-attachment-store.c:492 ../e-util/e-attachment-store.c:494
 msgid "A_ttach"
 msgstr "A_nexar"
 
-#: ../e-util/e-attachment-store.c:536
+#: ../e-util/e-attachment-store.c:532
+msgid "Archive selected directories using this format:"
+msgstr "Arquivar os cartafoles seleccionados usando este formato:"
+
+#: ../e-util/e-attachment-store.c:625
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Gardar o anexo"
 msgstr[1] "Gardar os anexos"
 
-#. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
-#: ../e-util/e-attachment.c:2721
-msgid "attachment.dat"
-msgstr "attachment.dat"
+#: ../e-util/e-attachment-store.c:652
+msgid "Do _not extract files from the attachment"
+msgstr "Non _extraer os ficheiros do ficheiro anexo"
+
+#: ../e-util/e-attachment-store.c:657
+msgid "Save extracted files _only"
+msgstr "_Só gardar os ficheiros extraídos"
+
+#: ../e-util/e-attachment-store.c:662
+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
 msgid "Open With Other Application..."
@@ -10593,9 +10900,9 @@ msgid "Sa_ve As"
 msgstr "_Gardar como"
 
 #: ../e-util/e-attachment-view.c:400
-#: ../plugins/save-calendar/save-calendar.c:349
-#: ../plugins/save-calendar/save-calendar.c:380
-#: ../plugins/save-calendar/save-calendar.c:411
+#: ../plugins/save-calendar/save-calendar.c:346
+#: ../plugins/save-calendar/save-calendar.c:377
+#: ../plugins/save-calendar/save-calendar.c:408
 msgid "Save _As"
 msgstr "Gardar _como"
 
@@ -10604,12 +10911,12 @@ msgid "A_dd Attachment..."
 msgstr "Enga_dir un anexo…"
 
 #: ../e-util/e-attachment-view.c:417
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
-#: ../modules/calendar/e-task-shell-view-actions.c:752
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#: ../modules/addressbook/e-book-shell-view-actions.c:1129
+#: ../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:1619
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "_Properties"
 msgstr "_Propiedades"
 
@@ -10639,57 +10946,6 @@ msgstr "Abrir con «%s»"
 msgid "Open this attachment in %s"
 msgstr "Abrir este anexo en %s"
 
-# (pofilter) variables: (u'translation contains variables not in original: %d',)
-#. To Translators: This text is set as a description of an attached
-#. * message when, for example, attaching it to a composer. When the
-#. * message to be attached has also filled Subject, then this text is
-#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1108
-msgid "Attached message"
-msgstr "Mensaxe anexada"
-
-#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
-msgid "A load operation is already in progress"
-msgstr "Xa se está en proceso unha operación de carga"
-
-#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
-msgid "A save operation is already in progress"
-msgstr "Xa se está en proceso unha operación de gardado"
-
-#: ../e-util/e-attachment.c:2267
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Non foi posíbel cargar «%s»"
-
-#: ../e-util/e-attachment.c:2270
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Non foi posíbel cargar o anexo"
-
-#: ../e-util/e-attachment.c:2574
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Non foi posíbel abrir «%s»"
-
-#: ../e-util/e-attachment.c:2577
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Non foi posíbel abrir o anexo"
-
-#: ../e-util/e-attachment.c:3044
-msgid "Attachment contents not loaded"
-msgstr "Non se cargaron os contidos do anexo"
-
-#: ../e-util/e-attachment.c:3124
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Non foi posíbel gardar «%s»"
-
-#: ../e-util/e-attachment.c:3127
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Non foi posíbel gardar o anexo"
-
 #: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "Marcar como axenda de enderezos predefinida"
@@ -10708,6 +10964,44 @@ msgstr ""
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl+clic para abrir unha ligazón"
 
+#: ../e-util/e-calendar.c:195
+msgid "Previous month"
+msgstr "Anterior mes"
+
+#: ../e-util/e-calendar.c:220
+msgid "Next month"
+msgstr "Seguinte mes"
+
+#: ../e-util/e-calendar.c:246
+msgid "Previous year"
+msgstr "Anterior ano"
+
+#: ../e-util/e-calendar.c:271
+msgid "Next year"
+msgstr "Seguinte ano"
+
+#: ../e-util/e-calendar.c:295
+msgid "Month Calendar"
+msgstr "Calendario mensual"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1343 ../e-util/e-calendar-item.c:2221
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1345
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1382
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%B de %Y"
+
 #: ../e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "Marcar como calendario predefinido"
@@ -10741,44 +11035,6 @@ msgstr ""
 "Copiar localmente os contidos da lista de notas para unha operación sen "
 "conexión"
 
-#. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
-msgctxt "CalItem"
-msgid "%B"
-msgstr "%B"
-
-#. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1328
-msgctxt "CalItem"
-msgid "%Y"
-msgstr "%Y"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1365
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%B de %Y"
-
-#: ../e-util/e-calendar.c:189
-msgid "Previous month"
-msgstr "Anterior mes"
-
-#: ../e-util/e-calendar.c:214
-msgid "Next month"
-msgstr "Seguinte mes"
-
-#: ../e-util/e-calendar.c:240
-msgid "Previous year"
-msgstr "Anterior ano"
-
-#: ../e-util/e-calendar.c:265
-msgid "Next year"
-msgstr "Seguinte ano"
-
-#: ../e-util/e-calendar.c:289
-msgid "Month Calendar"
-msgstr "Calendario mensual"
-
 #: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "Categorías en _uso actualmente:"
@@ -10787,17 +11043,17 @@ msgstr "Categorías en _uso actualmente:"
 msgid "_Available Categories:"
 msgstr "Cate_gorias dispoñíbeis:"
 
-#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
+#: ../e-util/e-categories-editor.c:274
 #: ../plugins/mail-to-task/mail-to-task.c:595
 #: ../shell/e-shell-window-actions.c:1100
 msgid "_New"
 msgstr "_Novo"
 
-#: ../e-util/e-categories-selector.c:321
+#: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "Iconas"
 
-#: ../e-util/e-category-completion.c:299
+#: ../e-util/e-category-completion.c:307
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Crear categoría «%s»"
@@ -10833,13 +11089,17 @@ 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:1877
+msgid "?"
+msgstr "?"
+
 #: ../e-util/e-cell-date-edit.c:298
 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
-#: ../modules/calendar/e-cal-shell-view-actions.c:1899
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
 #: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "Hoxe"
@@ -10855,32 +11115,16 @@ msgstr "Ningún"
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../e-util/e-cell-date-edit.c:872
+#: ../e-util/e-cell-date-edit.c:873
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "O tempo ten que ter o formato: %s"
 
-#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1853
-msgid "?"
-msgstr "?"
-
-#: ../e-util/e-cell-percent.c:79
+#: ../e-util/e-cell-percent.c:81
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 "A porcentaxe ten que ser un valor entre 0 e 100, ambos os dous incluídos"
 
-#: ../e-util/e-charset-combo-box.c:99
-msgid "Character Encoding"
-msgstr "Codificación de caracteres"
-
-#: ../e-util/e-charset-combo-box.c:122
-msgid "Enter the character set to use"
-msgstr "Introduza o conxunto de caracteres que se vai usar"
-
-#: ../e-util/e-charset-combo-box.c:368
-msgid "Other..."
-msgstr "Outro…"
-
 #: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Árabe"
@@ -10958,12 +11202,195 @@ msgstr "Ucraíno"
 msgid "Visual"
 msgstr "Visual"
 
-#: ../e-util/e-client-cache.c:1189
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "Codificación de caracteres"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Introduza o conxunto de caracteres que se vai usar"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "Outro…"
+
+#: ../e-util/e-client-cache.c:1209
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr ""
 "Non foi posíbel crear un obxecto cliente desde o nome da extensión «%s»"
 
+#: ../e-util/e-color-chooser-widget.c:124
+msgid "Choose custom color"
+msgstr "Escoller cor personalizado"
+
+#: ../e-util/e-color-combo.c:81
+msgid "black"
+msgstr "negro"
+
+#: ../e-util/e-color-combo.c:82
+msgid "light brown"
+msgstr "marrón claro"
+
+#: ../e-util/e-color-combo.c:83
+msgid "brown gold"
+msgstr "ouro claro"
+
+#: ../e-util/e-color-combo.c:84
+msgid "dark green #2"
+msgstr "verde escuro #2"
+
+#: ../e-util/e-color-combo.c:85
+msgid "navy"
+msgstr "mariño"
+
+#: ../e-util/e-color-combo.c:86
+msgid "dark blue"
+msgstr "azul escuro"
+
+#: ../e-util/e-color-combo.c:87
+msgid "purple #2"
+msgstr "morado #2"
+
+#: ../e-util/e-color-combo.c:88
+msgid "very dark gray"
+msgstr "gris moi escuro"
+
+#: ../e-util/e-color-combo.c:90
+msgid "dark red"
+msgstr "vermello escuro"
+
+#: ../e-util/e-color-combo.c:91
+msgid "red-orange"
+msgstr "vermello anaranxado"
+
+#: ../e-util/e-color-combo.c:92
+msgid "gold"
+msgstr "ouro"
+
+#: ../e-util/e-color-combo.c:93
+msgid "dark green"
+msgstr "verde escuro"
+
+#: ../e-util/e-color-combo.c:94
+msgid "dull blue"
+msgstr "azul mate"
+
+#: ../e-util/e-color-combo.c:95
+msgid "blue"
+msgstr "azul"
+
+#: ../e-util/e-color-combo.c:96
+msgid "dull purple"
+msgstr "morado mate"
+
+#: ../e-util/e-color-combo.c:97
+msgid "dark grey"
+msgstr "gris escuro"
+
+#: ../e-util/e-color-combo.c:99
+msgid "red"
+msgstr "vermello"
+
+#: ../e-util/e-color-combo.c:100
+msgid "orange"
+msgstr "laranxa"
+
+#: ../e-util/e-color-combo.c:101
+msgid "lime"
+msgstr "lima"
+
+#: ../e-util/e-color-combo.c:102
+msgid "dull green"
+msgstr "verde mate"
+
+#: ../e-util/e-color-combo.c:103
+msgid "dull blue #2"
+msgstr "azul mate #2"
+
+#: ../e-util/e-color-combo.c:104
+msgid "sky blue #2"
+msgstr "azul ceo #2"
+
+#: ../e-util/e-color-combo.c:105
+msgid "purple"
+msgstr "morado"
+
+#: ../e-util/e-color-combo.c:106
+msgid "gray"
+msgstr "gris"
+
+#: ../e-util/e-color-combo.c:108
+msgid "magenta"
+msgstr "maxenta"
+
+#: ../e-util/e-color-combo.c:109
+msgid "bright orange"
+msgstr "laranxa claro"
+
+#: ../e-util/e-color-combo.c:110
+msgid "yellow"
+msgstr "amarelo"
+
+#: ../e-util/e-color-combo.c:111
+msgid "green"
+msgstr "verde"
+
+#: ../e-util/e-color-combo.c:112
+msgid "cyan"
+msgstr "cian"
+
+#: ../e-util/e-color-combo.c:113
+msgid "bright blue"
+msgstr "azul claro"
+
+#: ../e-util/e-color-combo.c:114
+msgid "red purple"
+msgstr "vermello morado"
+
+#: ../e-util/e-color-combo.c:115
+msgid "light grey"
+msgstr "gris claro"
+
+#: ../e-util/e-color-combo.c:117
+msgid "pink"
+msgstr "rosa"
+
+#: ../e-util/e-color-combo.c:118
+msgid "light orange"
+msgstr "laranxa claro"
+
+#: ../e-util/e-color-combo.c:119
+msgid "light yellow"
+msgstr "amarelo claro"
+
+#: ../e-util/e-color-combo.c:120
+msgid "light green"
+msgstr "verde claro"
+
+#: ../e-util/e-color-combo.c:121
+msgid "light cyan"
+msgstr "cian claro"
+
+#: ../e-util/e-color-combo.c:122
+msgid "light blue"
+msgstr "azul claro"
+
+#: ../e-util/e-color-combo.c:123
+msgid "light purple"
+msgstr "morado claro"
+
+#: ../e-util/e-color-combo.c:124
+msgid "white"
+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:3656
+#: ../mail/mail-config.ui.h:68
+msgid "Default"
+msgstr "predeterminado"
+
 #: ../e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Data e hora"
@@ -11088,6 +11515,111 @@ msgstr "Usar a localización predeterminada"
 msgid "Format:"
 msgstr "Formato:"
 
+#. Translators: :-)
+#: ../e-util/e-emoticon-chooser.c:39
+msgid "_Smile"
+msgstr "_Sorriso"
+
+#. Translators: :-(
+#: ../e-util/e-emoticon-chooser.c:41
+msgid "S_ad"
+msgstr "Trist_e"
+
+#. Translators: ;-)
+#: ../e-util/e-emoticon-chooser.c:43
+msgid "_Wink"
+msgstr "_Guiño"
+
+#. Translators: :-P
+#: ../e-util/e-emoticon-chooser.c:45
+msgid "Ton_gue"
+msgstr "Lin_gua"
+
+#. Translators: :-))
+#: ../e-util/e-emoticon-chooser.c:47
+msgid "Laug_h"
+msgstr "Ris_a"
+
+#. Translators: :-|
+#: ../e-util/e-emoticon-chooser.c:49
+msgid "_Plain"
+msgstr "_Indiferente"
+
+#. Translators: :-!
+#: ../e-util/e-emoticon-chooser.c:51
+msgid "Smi_rk"
+msgstr ""
+
+#. Translators: :"-)
+#: ../e-util/e-emoticon-chooser.c:53
+msgid "_Embarrassed"
+msgstr "_Avergonzado"
+
+#. Translators: :-D
+#: ../e-util/e-emoticon-chooser.c:55
+msgid "_Big Smile"
+msgstr "Sorriso _grande"
+
+#. Translators: :-/
+#: ../e-util/e-emoticon-chooser.c:57
+msgid "Uncer_tain"
+msgstr ""
+
+#. Translators: :-O
+#: ../e-util/e-emoticon-chooser.c:59
+msgid "S_urprise"
+msgstr "S_orpresa"
+
+#. Translators: :-S
+#: ../e-util/e-emoticon-chooser.c:61
+msgid "W_orried"
+msgstr "Pre_ocupado"
+
+#. Translators: :-*
+#: ../e-util/e-emoticon-chooser.c:63
+msgid "_Kiss"
+msgstr "_Bico"
+
+#. Translators: X-(
+#: ../e-util/e-emoticon-chooser.c:65
+msgid "A_ngry"
+msgstr "E_nfadado"
+
+#. Translators: B-)
+#: ../e-util/e-emoticon-chooser.c:67
+msgid "_Cool"
+msgstr "_Molón"
+
+#. Translators: O:-)
+#: ../e-util/e-emoticon-chooser.c:69
+msgid "Ange_l"
+msgstr "An_xo"
+
+#. Translators: :'(
+#: ../e-util/e-emoticon-chooser.c:71
+msgid "Cr_ying"
+msgstr "Cho_rando"
+
+#. Translators: :-Q
+#: ../e-util/e-emoticon-chooser.c:73
+msgid "S_ick"
+msgstr "En_fermo"
+
+#. Translators: |-)
+#: ../e-util/e-emoticon-chooser.c:75
+msgid "Tire_d"
+msgstr "Cansa_do"
+
+#. Translators: >:-)
+#: ../e-util/e-emoticon-chooser.c:77
+msgid "De_vilish"
+msgstr ""
+
+#. Translators: :-(|)
+#: ../e-util/e-emoticon-chooser.c:79
+msgid "_Monkey"
+msgstr "_Mo_no"
+
 #: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(Nome de ficheiro descoñecido)"
@@ -11240,23 +11772,23 @@ msgstr "Seleccionar un tempo co que comparar"
 msgid "Choose a File"
 msgstr "Seleccionar un ficheiro"
 
-#: ../e-util/e-filter-rule.c:750
+#: ../e-util/e-filter-rule.c:751
 msgid "R_ule name:"
 msgstr "Nome da r_egra:"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:801
 msgid "all the following conditions"
 msgstr "todas as seguintes condicións"
 
-#: ../e-util/e-filter-rule.c:801
+#: ../e-util/e-filter-rule.c:802
 msgid "any of the following conditions"
 msgstr "calquera das seguintes condicións"
 
-#: ../e-util/e-filter-rule.c:807
+#: ../e-util/e-filter-rule.c:808
 msgid "_Find items which match:"
 msgstr "_Buscar elementos que coincidan con:"
 
-#: ../e-util/e-filter-rule.c:830
+#: ../e-util/e-filter-rule.c:831
 msgid "Find items that meet the following conditions"
 msgstr "Encontrar os elementos que cumpran as seguintes condicións"
 
@@ -11264,38 +11796,1135 @@ msgstr "Encontrar os elementos que cumpran as seguintes condicións"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
-#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:60
+#: ../e-util/e-mail-identity-combo-box.c:472
+#: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
 msgid "None"
 msgstr "Ningunha"
 
-#: ../e-util/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:847
 msgid "All related"
 msgstr "Todos os relacionados"
 
-#: ../e-util/e-filter-rule.c:848
+#: ../e-util/e-filter-rule.c:848 ../e-util/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Respostas"
+
+#: ../e-util/e-filter-rule.c:849
 msgid "Replies and parents"
 msgstr "Respostas e pais"
 
-#: ../e-util/e-filter-rule.c:849
+#: ../e-util/e-filter-rule.c:850
 msgid "No reply or parent"
 msgstr "Sen resposta nin pai"
 
-#: ../e-util/e-filter-rule.c:852
+#: ../e-util/e-filter-rule.c:853
 msgid "I_nclude threads:"
 msgstr "I_ncluír fíos:"
 
-#: ../e-util/e-filter-rule.c:929
+#: ../e-util/e-filter-rule.c:930
 msgid "A_dd Condition"
 msgstr "Enga_dir unha condición"
 
-#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
+#: ../mail/em-utils.c:229
+msgid "Incoming"
+msgstr "Entrante"
+
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "Saínte"
 
+#: ../e-util/e-html-editor-actions.c:56
+msgid "Failed to insert HTML file."
+msgstr "Produciuse un fallo ao inserir o ficheiro HTML."
+
+#: ../e-util/e-html-editor-actions.c:93
+msgid "Failed to insert text file."
+msgstr "Produciuse un fallo ao inserir o ficheiro de texto."
+
+#: ../e-util/e-html-editor-actions.c:470
+msgid "Insert HTML File"
+msgstr "Inserir ficheiro HTML"
+
+#: ../e-util/e-html-editor-actions.c:476
+msgid "HTML file"
+msgstr "Ficheiro HTML"
+
+#: ../e-util/e-html-editor-actions.c:503
+#: ../e-util/e-html-editor-actions.c:1266
+msgid "Insert Image"
+msgstr "Inserir imaxe"
+
+#: ../e-util/e-html-editor-actions.c:563
+msgid "Insert text file"
+msgstr "Inserir ficheiro de texto"
+
+#: ../e-util/e-html-editor-actions.c:569
+msgid "Text file"
+msgstr "Ficheiro de texto"
+
+#: ../e-util/e-html-editor-actions.c:938
+msgid "Copy selected text to the clipboard"
+msgstr "Copiar o texto seleccionado ao portapapeis"
+
+#: ../e-util/e-html-editor-actions.c:945
+msgid "Cut selected text to the clipboard"
+msgstr "Cortar o texto seleccionado ao portapapeis"
+
+#: ../e-util/e-html-editor-actions.c:950
+msgid "_Increase Indent"
+msgstr "_Aumentar sangría"
+
+#: ../e-util/e-html-editor-actions.c:952
+msgid "Increase Indent"
+msgstr "Aumentar sangría"
+
+#: ../e-util/e-html-editor-actions.c:957
+msgid "_HTML File..."
+msgstr "Ficheiro _HTML…"
+
+#: ../e-util/e-html-editor-actions.c:964
+msgid "Te_xt File..."
+msgstr "Ficheiro de te_xto…"
+
+#. Widgets are treating Ctrl + v shortcut themselves
+#: ../e-util/e-html-editor-actions.c:973
+#, fuzzy
+msgid "Paste text from the clipboard"
+msgstr "Pegar as actividades desde o portapapeis"
+
+#: ../e-util/e-html-editor-actions.c:978
+msgid "Paste _Quotation"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:987
+msgid "Redo the last undone action"
+msgstr "Refacer a última acción desfeita"
+
+#: ../e-util/e-html-editor-actions.c:999
+msgid "_Find..."
+msgstr "_Buscar…"
+
+#: ../e-util/e-html-editor-actions.c:1001
+msgid "Search for text"
+msgstr "Busca de texto"
+
+#: ../e-util/e-html-editor-actions.c:1006
+msgid "Find A_gain"
+msgstr "Buscar de _novo"
+
+#: ../e-util/e-html-editor-actions.c:1013
+msgid "Re_place..."
+msgstr "S_ubstituír…"
+
+#: ../e-util/e-html-editor-actions.c:1015
+msgid "Search for and replace text"
+msgstr "Buscar e substituír un texto"
+
+#: ../e-util/e-html-editor-actions.c:1020
+msgid "Check _Spelling..."
+msgstr "Comprobar _ortografía…"
+
+#: ../e-util/e-html-editor-actions.c:1029
+msgid "Undo the last action"
+msgstr "Desfacer a última acción"
+
+#: ../e-util/e-html-editor-actions.c:1034
+msgid "_Decrease Indent"
+msgstr "_Diminuír sangría"
+
+#: ../e-util/e-html-editor-actions.c:1036
+msgid "Decrease Indent"
+msgstr "Diminuír sangría"
+
+#: ../e-util/e-html-editor-actions.c:1041
+msgid "_Wrap Lines"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1048
+msgid "Open Inspector"
+msgstr "Abrir inspector"
+
+#: ../e-util/e-html-editor-actions.c:1071
+msgid "For_mat"
+msgstr "For_mato"
+
+#: ../e-util/e-html-editor-actions.c:1078
+#, fuzzy
+msgid "_Paragraph Style"
+msgstr "Estilo da _barra de ferramentas"
+
+#: ../e-util/e-html-editor-actions.c:1092
+#: ../e-util/e-html-editor-image-dialog.c:591
+#, fuzzy
+msgid "_Alignment"
+msgstr "A_liñamento"
+
+#: ../e-util/e-html-editor-actions.c:1099
+#, fuzzy
+msgid "Current _Languages"
+msgstr "I_diomas"
+
+#. Center
+#: ../e-util/e-html-editor-actions.c:1116
+#: ../e-util/e-html-editor-paragraph-dialog.c:110
+msgid "_Center"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1118
+#, fuzzy
+msgid "Center Alignment"
+msgstr "A_liñamento"
+
+#. Left
+#: ../e-util/e-html-editor-actions.c:1123
+#: ../e-util/e-html-editor-paragraph-dialog.c:101
+msgid "_Left"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1125
+#, fuzzy
+msgid "Left Alignment"
+msgstr "A_liñamento"
+
+#. Right
+#: ../e-util/e-html-editor-actions.c:1130
+#: ../e-util/e-html-editor-paragraph-dialog.c:119
+msgid "_Right"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1132
+#, fuzzy
+msgid "Right Alignment"
+msgstr "A_liñamento"
+
+#: ../e-util/e-html-editor-actions.c:1140
+#: ../modules/text-highlight/languages.c:72
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../e-util/e-html-editor-actions.c:1142
+msgid "HTML editing mode"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1147
+#, fuzzy
+msgid "Plain _Text"
+msgstr "Texto plano"
+
+#: ../e-util/e-html-editor-actions.c:1149
+#, fuzzy
+msgid "Plain text editing mode"
+msgstr "Modo de texto simple"
+
+#: ../e-util/e-html-editor-actions.c:1157
+#, fuzzy
+msgid "_Normal"
+msgstr "Normal"
+
+#: ../e-util/e-html-editor-actions.c:1164
+#, fuzzy
+msgid "Header _1"
+msgstr "Cabeceira"
+
+#: ../e-util/e-html-editor-actions.c:1171
+#, fuzzy
+msgid "Header _2"
+msgstr "Cabeceira"
+
+#: ../e-util/e-html-editor-actions.c:1178
+#, fuzzy
+msgid "Header _3"
+msgstr "Cabeceira"
+
+#: ../e-util/e-html-editor-actions.c:1185
+#, fuzzy
+msgid "Header _4"
+msgstr "Cabeceira"
+
+#: ../e-util/e-html-editor-actions.c:1192
+#, fuzzy
+msgid "Header _5"
+msgstr "Cabeceira"
+
+#: ../e-util/e-html-editor-actions.c:1199
+#, fuzzy
+msgid "Header _6"
+msgstr "Cabeceira"
+
+#: ../e-util/e-html-editor-actions.c:1206
+#, fuzzy
+msgid "_Preformatted"
+msgstr "Visualizar sen _formato"
+
+#: ../e-util/e-html-editor-actions.c:1213
+#, fuzzy
+msgid "A_ddress"
+msgstr "Enderezo"
+
+#: ../e-util/e-html-editor-actions.c:1220
+msgid "_Blockquote"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1227
+#, fuzzy
+msgid "_Bulleted List"
+msgstr "_Eliminar a lista de notas"
+
+#: ../e-util/e-html-editor-actions.c:1234
+msgid "_Roman Numeral List"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1241
+#, fuzzy
+msgid "Numbered _List"
+msgstr "Obter a _lista"
+
+#: ../e-util/e-html-editor-actions.c:1248
+msgid "_Alphabetical List"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1264
+#: ../e-util/e-html-editor-actions.c:1301
+#, fuzzy
+msgid "_Image..."
+msgstr "Gardar _imaxe…"
+
+#: ../e-util/e-html-editor-actions.c:1271
+#: ../e-util/e-html-editor-actions.c:1308
+msgid "_Link..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1273
+#, fuzzy
+msgid "Insert Link"
+msgstr "_Inserir"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1279
+#: ../e-util/e-html-editor-actions.c:1323
+#, fuzzy
+msgid "_Rule..."
+msgstr "_Renomear…"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1282
+#, fuzzy
+msgid "Insert Rule"
+msgstr "_Inserir"
+
+#: ../e-util/e-html-editor-actions.c:1287
+#: ../e-util/e-html-editor-actions.c:1330
+#, fuzzy
+msgid "_Table..."
+msgstr "Táboa"
+
+#: ../e-util/e-html-editor-actions.c:1289
+#, fuzzy
+msgid "Insert Table"
+msgstr "_Inserir"
+
+#: ../e-util/e-html-editor-actions.c:1294
+msgid "_Cell..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1315
+#, fuzzy
+msgid "Pa_ge..."
+msgstr "Gardar _imaxe…"
+
+#: ../e-util/e-html-editor-actions.c:1339
+msgid "Font _Size"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1346
+#, fuzzy
+msgid "_Font Style"
+msgstr "Estilo do _reencamiñamento:"
+
+#: ../e-util/e-html-editor-actions.c:1353
+msgid "Paste As _Text"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1364
+#: ../e-util/e-html-editor-text-dialog.c:214
+msgid "_Bold"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1366
+msgid "Bold"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1372
+#: ../e-util/e-html-editor-text-dialog.c:225
+msgid "_Italic"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1374
+msgid "Italic"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1380
+#, fuzzy
+msgid "_Plain Text"
+msgstr "Texto plano"
+
+#: ../e-util/e-html-editor-actions.c:1388
+#: ../e-util/e-html-editor-text-dialog.c:246
+msgid "_Strikethrough"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1390
+msgid "Strikethrough"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1396
+#: ../e-util/e-html-editor-text-dialog.c:236
+#, fuzzy
+msgid "_Underline"
+msgstr "Sen definir"
+
+#: ../e-util/e-html-editor-actions.c:1398
+#, fuzzy
+msgid "Underline"
+msgstr "Sen definir"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1408
+msgid "-2"
+msgstr ""
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1416
+#, fuzzy
+msgid "-1"
+msgstr "1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1424
+msgid "+0"
+msgstr ""
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1432
+#, fuzzy
+msgid "+1"
+msgstr "1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1440
+msgid "+2"
+msgstr ""
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1448
+msgid "+3"
+msgstr ""
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1456
+msgid "+4"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1475
+#, fuzzy
+msgid "Cell Contents"
+msgstr "_Contidos"
+
+#: ../e-util/e-html-editor-actions.c:1482
+#, fuzzy
+msgid "Column"
+msgstr "Engadir unha columna"
+
+#: ../e-util/e-html-editor-actions.c:1489
+#, fuzzy
+msgid "Row"
+msgstr "Baixa"
+
+#: ../e-util/e-html-editor-actions.c:1496
+#: ../e-util/e-html-editor-actions.c:1581
+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:1506
+#, fuzzy
+msgid "Table Delete"
+msgstr "Cela da táboa"
+
+#: ../e-util/e-html-editor-actions.c:1513 ../e-util/e-text.c:2127
+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:1521
+#, fuzzy
+msgid "Table Insert"
+msgstr "Cela da táboa"
+
+#: ../e-util/e-html-editor-actions.c:1528
+#, fuzzy
+msgid "Properties"
+msgstr "_Propiedades"
+
+#: ../e-util/e-html-editor-actions.c:1546
+msgid "Column After"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1553
+msgid "Column Before"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1560
+#, fuzzy
+msgid "Insert _Link"
+msgstr "_Inserir"
+
+#: ../e-util/e-html-editor-actions.c:1567
+msgid "Row Above"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1574
+msgid "Row Below"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1588
+msgid "Cell..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1595
+#, fuzzy
+msgid "Image..."
+msgstr "Imaxe"
+
+#: ../e-util/e-html-editor-actions.c:1602
+msgid "Link..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1609
+#, fuzzy
+msgid "Page..."
+msgstr "Buscapersoas"
+
+#: ../e-util/e-html-editor-actions.c:1616
+msgid "Paragraph..."
+msgstr ""
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1624
+#, fuzzy
+msgid "Rule..."
+msgstr "_Nome completo…"
+
+#: ../e-util/e-html-editor-actions.c:1631
+#, fuzzy
+msgid "Table..."
+msgstr "Táboa"
+
+#: ../e-util/e-html-editor-actions.c:1638
+#, fuzzy
+msgid "Text..."
+msgstr "Seleccionar…"
+
+#: ../e-util/e-html-editor-actions.c:1645
+#, fuzzy
+msgid "Remove Link"
+msgstr "_Retirar"
+
+#: ../e-util/e-html-editor-actions.c:1662
+#, fuzzy
+msgid "Add Word to Dictionary"
+msgstr "Engadir \"%s\" ao Dicionario"
+
+#: ../e-util/e-html-editor-actions.c:1669
+#, fuzzy
+msgid "Ignore Misspelled Word"
+msgstr "Cor para as palabras escritas incorrecta_mente:"
+
+#: ../e-util/e-html-editor-actions.c:1676
+msgid "Add Word To"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1685
+#, fuzzy
+msgid "More Suggestions"
+msgstr "(non hai 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:1793
+#, fuzzy, c-format
+msgid "%s Dictionary"
+msgstr "Engadir \"%s\" ao Dicionario"
+
+#: ../e-util/e-html-editor-actions.c:1873
+msgid "_Emoticon"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1874
+#, fuzzy
+msgid "Insert Emoticon"
+msgstr "Introducir opcións de envío"
+
+#: ../e-util/e-html-editor-actions.c:1942
+#, fuzzy
+msgid "Re_place"
+msgstr "S_ubstituír"
+
+#: ../e-util/e-html-editor-actions.c:1945
+#, fuzzy
+msgid "_Image"
+msgstr "Imaxe"
+
+#: ../e-util/e-html-editor-actions.c:1948
+msgid "_Link"
+msgstr ""
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1952
+#, fuzzy
+msgid "_Rule"
+msgstr "Engadir unha regra"
+
+#: ../e-util/e-html-editor-actions.c:1955
+#: ../e-util/e-html-editor-cell-dialog.c:658
+#, fuzzy
+msgid "_Table"
+msgstr "Táboa"
+
+#: ../e-util/e-html-editor.c:669
+msgid "Paragraph Style"
+msgstr ""
+
+#: ../e-util/e-html-editor.c:683
+#, fuzzy
+msgid "Editing Mode"
+msgstr "Editar recordatorio"
+
+#: ../e-util/e-html-editor.c:695
+#, fuzzy
+msgid "Font Color"
+msgstr "Quitar cor"
+
+#: ../e-util/e-html-editor.c:713
+#, fuzzy
+msgid "Font Size"
+msgstr "Tamaño"
+
+#: ../e-util/e-html-editor-cell-dialog.c:618
+msgid "<b>Scope</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:632
+msgid "C_ell"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:645
+msgid "_Row"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:671
+msgid "Col_umn"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:681
+msgid "<b>Alignment &amp; Behavior</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:694
+#: ../e-util/e-html-editor-hrule-dialog.c:384
+#: ../e-util/e-html-editor-table-dialog.c:819
+msgid "Left"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:695
+#: ../e-util/e-html-editor-hrule-dialog.c:386
+#: ../e-util/e-html-editor-table-dialog.c:820
+msgid "Center"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:696
+#: ../e-util/e-html-editor-hrule-dialog.c:388
+#: ../e-util/e-html-editor-table-dialog.c:821
+msgid "Right"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:704
+msgid "_Horizontal:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:712
+#: ../e-util/e-html-editor-image-dialog.c:581
+#, fuzzy
+msgid "Top"
+msgstr "_Inicio"
+
+#: ../e-util/e-html-editor-cell-dialog.c:713
+#: ../e-util/e-html-editor-image-dialog.c:582
+#, fuzzy
+msgid "Middle"
+msgstr "_Apelido 1:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:714
+#: ../e-util/e-html-editor-image-dialog.c:583
+#, fuzzy
+msgid "Bottom"
+msgstr "_Final"
+
+#: ../e-util/e-html-editor-cell-dialog.c:722
+#, fuzzy
+msgid "_Vertical:"
+msgstr "Vista _vertical"
+
+#. Wrap Text
+#: ../e-util/e-html-editor-cell-dialog.c:728
+#, fuzzy
+msgid "_Wrap Text"
+msgstr "Texto plano"
+
+#. Header Style
+#: ../e-util/e-html-editor-cell-dialog.c:736
+#, fuzzy
+msgid "_Header Style"
+msgstr "Valor da cabecera"
+
+#: ../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
+msgid "<b>Layout</b>"
+msgstr ""
+
+#. Width
+#: ../e-util/e-html-editor-cell-dialog.c:761
+msgid "_Width"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:800
+msgid "Row S_pan:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:814
+msgid "Co_lumn Span:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:821
+#: ../e-util/e-html-editor-table-dialog.c:835
+msgid "<b>Background</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:834
+#: ../e-util/e-html-editor-table-dialog.c:848
+msgid "Transparent"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:842
+#, fuzzy
+msgid "C_olor:"
+msgstr "Cor:"
+
+#: ../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
+#, fuzzy
+msgid "Choose Background Image"
+msgstr "Non foi posíbel definir como 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
+#, fuzzy
+msgid "Images"
+msgstr "Imaxe"
+
+#: ../e-util/e-html-editor-cell-dialog.c:868
+#, fuzzy
+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
+#, fuzzy
+msgid "_Remove image"
+msgstr "_Sen imaxe"
+
+#: ../e-util/e-html-editor-cell-dialog.c:895
+#, fuzzy
+msgid "Cell Properties"
+msgstr "_Propiedades"
+
+#: ../e-util/e-html-editor-find-dialog.c:105
+#: ../e-util/e-html-editor-replace-dialog.c:90
+#: ../e-util/e-html-editor-replace-dialog.c:108
+msgid "No match found"
+msgstr ""
+
+#: ../e-util/e-html-editor-find-dialog.c:160
+#: ../e-util/e-html-editor-replace-dialog.c:229
+#, fuzzy
+msgid "Search _backwards"
+msgstr "_Base de busca:"
+
+#: ../e-util/e-html-editor-find-dialog.c:167
+msgid "Case _Sensitive"
+msgstr ""
+
+#: ../e-util/e-html-editor-find-dialog.c:174
+#, fuzzy
+msgid "_Wrap Search"
+msgstr "_Buscar"
+
+#: ../e-util/e-html-editor-find-dialog.c:213
+#, fuzzy
+msgid "Find"
+msgstr "_Buscar"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:319
+msgid "<b>Size</b>"
+msgstr ""
+
+#. Width
+#: ../e-util/e-html-editor-hrule-dialog.c:339
+#: ../e-util/e-html-editor-image-dialog.c:539
+#: ../e-util/e-html-editor-table-dialog.c:742
+msgid "_Width:"
+msgstr ""
+
+#: ../e-util/e-html-editor-hrule-dialog.c:364
+#, fuzzy
+msgid "_Size:"
+msgstr "Tamaño"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:371
+msgid "<b>Style</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-hrule-dialog.c:396
+#: ../e-util/e-html-editor-table-dialog.c:828
+#, fuzzy
+msgid "_Alignment:"
+msgstr "A_liñamento"
+
+#. Shaded
+#: ../e-util/e-html-editor-hrule-dialog.c:402
+msgid "S_haded"
+msgstr ""
+
+#: ../e-util/e-html-editor-hrule-dialog.c:419
+#, fuzzy
+msgid "Rule properties"
+msgstr "Propiedades do cartafol"
+
+#: ../e-util/e-html-editor-image-dialog.c:471
+#: ../e-util/e-html-editor-paragraph-dialog.c:66
+#: ../e-util/e-html-editor-table-dialog.c:685
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Xeral"
+
+#: ../e-util/e-html-editor-image-dialog.c:500
+#, fuzzy
+msgid "_Source:"
+msgstr "Fonte"
+
+#: ../e-util/e-html-editor-image-dialog.c:563
+msgid "_Height:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:604
+msgid "_X-Padding:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:620
+msgid "_Y-Padding:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:636
+#: ../e-util/e-html-editor-table-dialog.c:809
+msgid "_Border:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:646
+msgid "<b>Link</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-link-dialog.c:334
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../e-util/e-html-editor-image-dialog.c:669
+#: ../e-util/e-html-editor-link-dialog.c:339
+msgid "_Test URL..."
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:686
+#, fuzzy
+msgid "Image Properties"
+msgstr "Propiedades da categoría"
+
+#: ../e-util/e-html-editor-link-dialog.c:363
+#, fuzzy
+msgid "_Remove Link"
+msgstr "_Retirar"
+
+#: ../e-util/e-html-editor-link-dialog.c:388
+#, fuzzy
+msgid "Link Properties"
+msgstr "_Propiedades"
+
+#: ../e-util/e-html-editor-page-dialog.c:69
+msgid "Perforated Paper"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:78
+msgid "Blue Ink"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:87
+msgid "Paper"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:96
+msgid "Ribbon"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:105
+msgid "Midnight"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:123 ../mail/filtertypes.xml.in.h:35
+#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+msgid "Draft"
+msgstr "Borrador"
+
+#: ../e-util/e-html-editor-page-dialog.c:132
+msgid "Graph Paper"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:415
+msgid "<b>Colors</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:434
+#, fuzzy
+msgid "_Text:"
+msgstr "Só _texto"
+
+#: ../e-util/e-html-editor-page-dialog.c:449
+msgid "_Link:"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:464
+#, fuzzy
+msgid "_Background:"
+msgstr "Estabelecer como _fondo"
+
+#: ../e-util/e-html-editor-page-dialog.c:472
+msgid "<b>Background Image</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:494
+#, fuzzy
+msgid "_Template:"
+msgstr "Modelo:"
+
+#: ../e-util/e-html-editor-page-dialog.c:502
+#, fuzzy
+msgid "Selection a file"
+msgstr "Seleccionar un ficheiro"
+
+#: ../e-util/e-html-editor-page-dialog.c:509
+#, fuzzy
+msgid "_Custom:"
+msgstr "_Personalizar"
+
+#: ../e-util/e-html-editor-page-dialog.c:536
+#, fuzzy
+msgid "Page Properties"
+msgstr "_Propiedades"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:83
+#, fuzzy
+msgid "_Style:"
+msgstr "Estilo da _resposta:"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:90
+#, fuzzy
+msgid "<b>Alignment</b>"
+msgstr "A_liñamento"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:155
+#, fuzzy
+msgid "Paragraph Properties"
+msgstr "Propiedades da categoría"
+
+#: ../e-util/e-html-editor-replace-dialog.c:148
+#, fuzzy, c-format
+msgid "%d occurences replaced"
+msgstr "aparicións"
+
+#: ../e-util/e-html-editor-replace-dialog.c:209
+#, fuzzy
+msgid "R_eplace:"
+msgstr "S_ubstituír"
+
+#: ../e-util/e-html-editor-replace-dialog.c:221
+#, fuzzy
+msgid "_With:"
+msgstr "A_brir con"
+
+#: ../e-util/e-html-editor-replace-dialog.c:233
+msgid "_Case sensitive"
+msgstr ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:237
+#, fuzzy
+msgid "Wra_p search"
+msgstr "_Buscar"
+
+#: ../e-util/e-html-editor-replace-dialog.c:247
+msgid "_Skip"
+msgstr ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:255
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "S_ubstituír"
+
+#: ../e-util/e-html-editor-replace-dialog.c:263
+#, fuzzy
+msgid "Replace _All"
+msgstr "Responder a t_odos"
+
+#. Replace
+#: ../e-util/e-html-editor-replace-dialog.c:283
+#: ../e-util/e-html-editor-spell-check-dialog.c:536
+#, fuzzy
+msgid "Replace"
+msgstr "S_ubstituír"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:87
+#, c-format
+msgid "<b>Suggestions for '%s'</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:501
+msgid "<b>Suggestions</b>"
+msgstr ""
+
+#. Replace All
+#: ../e-util/e-html-editor-spell-check-dialog.c:545
+#, fuzzy
+msgid "Replace All"
+msgstr "S_ubstituír"
+
+#. Ignore
+#: ../e-util/e-html-editor-spell-check-dialog.c:554
+#: ../mail/mail.error.xml.h:109
+msgid "Ignore"
+msgstr "Ignorar"
+
+#. Skip
+#: ../e-util/e-html-editor-spell-check-dialog.c:563
+msgid "Skip"
+msgstr ""
+
+#. Back
+#: ../e-util/e-html-editor-spell-check-dialog.c:572
+#, fuzzy
+msgid "Back"
+msgstr "Atrás"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:581
+msgid "<b>Dictionary</b>"
+msgstr ""
+
+#. Add Word button
+#: ../e-util/e-html-editor-spell-check-dialog.c:601
+#, fuzzy
+msgid "Add word"
+msgstr "Engadir un cartafol"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:618
+#: ../mail/mail-config.ui.h:36
+msgid "Spell Checking"
+msgstr "Comprobación ortográfica"
+
+#: ../e-util/e-html-editor-table-dialog.c:707
+msgid "_Rows:"
+msgstr ""
+
+#: ../e-util/e-html-editor-table-dialog.c:724
+#, fuzzy
+msgid "C_olumns:"
+msgstr "Columna da _táboa:"
+
+#: ../e-util/e-html-editor-table-dialog.c:775
+msgid "_Spacing:"
+msgstr ""
+
+#: ../e-util/e-html-editor-table-dialog.c:792
+#, fuzzy
+msgid "_Padding:"
+msgstr "Cargando"
+
+#: ../e-util/e-html-editor-table-dialog.c:856
+#: ../e-util/e-html-editor-text-dialog.c:261
+#, fuzzy
+msgid "_Color:"
+msgstr "Cor:"
+
+#: ../e-util/e-html-editor-table-dialog.c:882
+#, fuzzy
+msgid "Image:"
+msgstr "Imaxe"
+
+#: ../e-util/e-html-editor-table-dialog.c:909
+#, fuzzy
+msgid "Table Properties"
+msgstr "Propiedades do calendario"
+
+#: ../e-util/e-html-editor-text-dialog.c:281
+msgid "Si_ze:"
+msgstr ""
+
+#: ../e-util/e-html-editor-text-dialog.c:296
+#, fuzzy
+msgid "Text Properties"
+msgstr "_Propiedades"
+
+#: ../e-util/e-html-editor-view.c:3066
+#, fuzzy
+msgid "Changed property"
+msgstr "Propiedades do calendario"
+
+#: ../e-util/e-html-editor-view.c:3067
+#, fuzzy
+msgid "Whether editor changed"
+msgstr "Indica se se debe emitir un pitido."
+
+#: ../e-util/e-html-editor-view.c:6694
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr ""
+
+#: ../e-util/e-html-editor-view.c:6698
+#, fuzzy
+msgid "_Don't lose formatting"
+msgstr "Formatado de enderezos"
+
+#: ../e-util/e-html-editor-view.c:6699
+#, fuzzy
+msgid "_Lose formatting"
+msgstr "Formatado de enderezos"
+
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -11329,7 +12958,7 @@ msgid "Import a _single file"
 msgstr "Importar un úni_co ficheiro"
 
 #: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:201
+#: ../modules/startup-wizard/e-mail-config-import-page.c:200
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a información que desexa importar:"
 
@@ -11344,7 +12973,7 @@ msgstr ""
 "poida importar. Se desexa tentalo de novo, prema o botón «Atrás»."
 
 #: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:230
+#: ../modules/startup-wizard/e-mail-config-import-page.c:229
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
@@ -11401,43 +13030,43 @@ msgstr "Seleccionar un ficheiro"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Prema en «Aplicar» para comezar a importar o ficheiro ao Evolution."
 
-#: ../e-util/e-mail-signature-combo-box.c:377
+#: ../e-util/e-mail-signature-combo-box.c:376
 msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
-#: ../e-util/e-mail-signature-editor.c:309
+#: ../e-util/e-mail-signature-editor.c:297
 msgid "Close"
 msgstr "Pechar"
 
-#: ../e-util/e-mail-signature-editor.c:314
+#: ../e-util/e-mail-signature-editor.c:302
 msgid "_Save and Close"
 msgstr "G_ardar e pechar"
 
-#: ../e-util/e-mail-signature-editor.c:528
+#: ../e-util/e-mail-signature-editor.c:529
 msgid "Edit Signature"
 msgstr "Editar a sinatura"
 
-#: ../e-util/e-mail-signature-editor.c:548
+#: ../e-util/e-mail-signature-editor.c:562
 msgid "_Signature Name:"
 msgstr "Nome da _sinatura:"
 
-#: ../e-util/e-mail-signature-editor.c:594
+#: ../e-util/e-mail-signature-editor.c:598
 msgid "Unnamed"
 msgstr "Sen nome"
 
-#: ../e-util/e-mail-signature-manager.c:337
+#: ../e-util/e-mail-signature-manager.c:336
 msgid "Add _Script"
 msgstr "Engadir un _script"
 
-#: ../e-util/e-mail-signature-manager.c:419
+#: ../e-util/e-mail-signature-manager.c:425
 msgid "Add Signature Script"
 msgstr "Engadir un script de sinatura"
 
-#: ../e-util/e-mail-signature-manager.c:489
+#: ../e-util/e-mail-signature-manager.c:496
 msgid "Edit Signature Script"
 msgstr "Editar o script de sinatura"
 
-#: ../e-util/e-mail-signature-script-dialog.c:394
+#: ../e-util/e-mail-signature-script-dialog.c:393
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11447,11 +13076,18 @@ msgstr ""
 "sinatura. O nome que indique usarase\n"
 "só para os efectos de vista."
 
-#: ../e-util/e-mail-signature-script-dialog.c:445
+#: ../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:309
+#: ../mail/e-mail-config-summary-page.c:339
+msgid "_Name:"
+msgstr "_Nome:"
+
+#: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "_Script:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:476
+#: ../e-util/e-mail-signature-script-dialog.c:475
 msgid "Script file must be executable."
 msgstr "O ficheiro do script debe ser executábel."
 
@@ -11468,14 +13104,34 @@ 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:246
+#: ../e-util/e-misc-utils.c:248
 msgid "Could not open the link."
 msgstr "Non foi posíbel abrir a ligazón."
 
-#: ../e-util/e-misc-utils.c:293
+#: ../e-util/e-misc-utils.c:295
 msgid "Could not display help for Evolution."
 msgstr "Non foi posíbel mostrar a axuda do Evolution."
 
+#: ../e-util/e-misc-utils.c:2390
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "Abrindo o calendario «%s»"
+
+#: ../e-util/e-misc-utils.c:2393
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "Abrindo a lista de notas «%s»"
+
+#: ../e-util/e-misc-utils.c:2396
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "Abrindo as tarefas «%s»"
+
+#: ../e-util/e-misc-utils.c:2399
+#, fuzzy, c-format
+msgid "Opening address book '%s'"
+msgstr "Abrindo o almacenamento «%s»"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Mostrar os contactos"
@@ -11494,10 +13150,10 @@ msgstr "_Buscar:"
 
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1112
-#: ../modules/calendar/e-cal-shell-view-actions.c:1732
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:1215
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:881
 msgid "Any Category"
 msgstr "Calquera categoría"
 
@@ -11525,25 +13181,25 @@ 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:3038
+#: ../e-util/e-name-selector-entry.c:3065
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "E_xpandir %s en liña"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3054
+#: ../e-util/e-name-selector-entry.c:3081
 #, c-format
 msgid "Cop_y %s"
 msgstr "Cop_iar %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3065
+#: ../e-util/e-name-selector-entry.c:3092
 #, c-format
 msgid "C_ut %s"
 msgstr "Co_rtar %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3083
+#: ../e-util/e-name-selector-entry.c:3110
 #, c-format
 msgid "_Edit %s"
 msgstr "_Editar %s"
@@ -11553,19 +13209,19 @@ msgstr "_Editar %s"
 msgid "_Delete %s"
 msgstr "E_liminar %s"
 
-#: ../e-util/e-online-button.c:30
+#: ../e-util/e-online-button.c:32
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "O Evolution está actualmente conectado. Prema neste botón para traballar sen "
 "conexión."
 
-#: ../e-util/e-online-button.c:33
+#: ../e-util/e-online-button.c:35
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "O Evolution está actualmente sen conexión. Prema neste botón para traballar "
 "conectado."
 
-#: ../e-util/e-online-button.c:36
+#: ../e-util/e-online-button.c:38
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "O Evolution está actualmente sen conexión porque a rede non está dispoñíbel."
@@ -11615,63 +13271,63 @@ msgstr ""
 "O sistema de impresión non devolveu ningunha información adicional sobre o "
 "erro."
 
-#: ../e-util/e-proxy-editor.c:314
+#: ../e-util/e-proxy-editor.c:325
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../e-util/e-proxy-editor.c:336
+#: ../e-util/e-proxy-editor.c:347
 msgid "Defer to Desktop Settings"
 msgstr "Delegar nas preferencias do escritorio"
 
-#: ../e-util/e-proxy-editor.c:340
+#: ../e-util/e-proxy-editor.c:351
 msgid "_Open Desktop Settings"
 msgstr "_Abrir as preferencias do escritorio"
 
-#: ../e-util/e-proxy-editor.c:366
+#: ../e-util/e-proxy-editor.c:377
 msgid "Manual"
 msgstr "Manual"
 
-#: ../e-util/e-proxy-editor.c:385
+#: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
 msgstr "Proxy _HTTP:"
 
-#: ../e-util/e-proxy-editor.c:416
+#: ../e-util/e-proxy-editor.c:427
 msgid "H_TTPS Proxy:"
 msgstr "Proxy H_TTPS:"
 
-#: ../e-util/e-proxy-editor.c:447
+#: ../e-util/e-proxy-editor.c:458
 msgid "_Socks Proxy:"
 msgstr "Proxy _Socks:"
 
-#: ../e-util/e-proxy-editor.c:478
+#: ../e-util/e-proxy-editor.c:489
 msgid "_Ignore Hosts:"
 msgstr "_Ignorar equipos:"
 
-#: ../e-util/e-proxy-editor.c:504
+#: ../e-util/e-proxy-editor.c:515
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../e-util/e-proxy-editor.c:523
+#: ../e-util/e-proxy-editor.c:534
 msgid "Configuration _URL:"
 msgstr "_URL de configuración:"
 
-#: ../e-util/e-proxy-editor.c:552
+#: ../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."
 
-#: ../e-util/e-proxy-preferences.c:177
+#: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
 msgstr "Cambiar ás preferencias de proxy básicas"
 
-#: ../e-util/e-proxy-preferences.c:179
+#: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "Cambiar ás preferencias de proxy avanzadas"
 
-#: ../e-util/e-proxy-preferences.c:463
+#: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
 msgstr "Aplicar as preferencias de proxy personalizadas para estas contas:"
 
-#: ../e-util/e-proxy-preferences.c:498
+#: ../e-util/e-proxy-preferences.c:561
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
@@ -11699,116 +13355,266 @@ msgstr "Engadir unha regra"
 msgid "Edit Rule"
 msgstr "Editar a  regra"
 
-#: ../e-util/e-search-bar.c:82
+#: ../e-util/e-search-bar.c:83
 #, c-format
 msgid "Matches: %u"
 msgstr "Coincide con: %u"
 
-#: ../e-util/e-search-bar.c:566
+#: ../e-util/e-search-bar.c:567
 msgid "Close the find bar"
 msgstr "Pechar esta barra de busca"
 
-#: ../e-util/e-search-bar.c:574
+#: ../e-util/e-search-bar.c:575
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
-#: ../e-util/e-search-bar.c:586
+#: ../e-util/e-search-bar.c:587
 msgid "Clear the search"
 msgstr "Limpar a busca"
 
-#: ../e-util/e-search-bar.c:610
+#: ../e-util/e-search-bar.c:611
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:614
 msgid "Find the previous occurrence of the phrase"
 msgstr "Buscar a anterior aparición na frase"
 
-#: ../e-util/e-search-bar.c:622
+#: ../e-util/e-search-bar.c:623
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:626
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar a seguinte aparición na frase"
 
-#: ../e-util/e-search-bar.c:634
+#: ../e-util/e-search-bar.c:635
 msgid "Mat_ch case"
 msgstr "_Coincidir maiúsculas e minúsculas"
 
-#: ../e-util/e-search-bar.c:662
+#: ../e-util/e-search-bar.c:663
 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:684
+#: ../e-util/e-search-bar.c:685
 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:537 ../mail/importers/elm-importer.c:327
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
 #: ../mail/importers/pine-importer.c:420
 #: ../modules/mail/e-mail-shell-view.c:1097
 msgid "Mail"
 msgstr "Correo"
 
-#: ../e-util/e-send-options.c:569
+#: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "Ao e_liminar:"
 
-#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Estándar"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Propietario"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Secreto"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Alto secreto"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "Só para os seus ollos"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Ningún"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Destinatario do correo"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "R_esposta solicitada"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Den_tro"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "días"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "_Cando sexa conveniente"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "_Atrasar a entrega da mensaxe"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Despois"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "días"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "_Estabelecer a data de vencemento"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Até"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Opcións de entrega"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Prioridade:"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Clasificación:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Opcións _xerais"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "Cr_ear un elemento enviado para seguir a información"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "_Entregada"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "_Entregado e aberto"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "Toda _a información"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "Eliminar a_utomaticamente o elemento enviado"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Seguimento de estado"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_Ao abrir:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "Ao _rexeitar:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "Ao co_mpletar:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "Ao ace_ptar:"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Devolver notificación"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "Seguimento de es_tado"
+
+#: ../e-util/e-source-config.c:684 ../e-util/e-source-config.c:688
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
+#: ../e-util/e-source-config.c:696 ../e-util/e-source-config.c:700
 msgid "Name:"
 msgstr "Nome:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1301
+#: ../e-util/e-source-config.c:1305
 msgid "Refresh every"
 msgstr "Actualizar cada"
 
-#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
+#: ../e-util/e-source-config.c:1335 ../e-util/e-source-config.c:1405
 msgid "Use a secure connection"
 msgstr "Usar unha conexión segura"
 
-#: ../e-util/e-source-config.c:1427
+#: ../e-util/e-source-config.c:1431
 msgid "Unset _trust for SSL certificate"
 msgstr "Desestabelecer _confianza para o certificado SSL"
 
-#: ../e-util/e-source-config.c:1463
+#: ../e-util/e-source-config.c:1467
 msgid "User"
 msgstr "Usuario"
 
-#: ../e-util/e-source-selector-dialog.c:226
+#: ../e-util/e-source-selector-dialog.c:229
 msgid "_Destination"
 msgstr "_Destino:"
 
-#: ../e-util/e-source-selector-dialog.c:339
+#: ../e-util/e-source-selector-dialog.c:342
 msgid "Select destination"
 msgstr "Seleccionar destino"
 
+#. Translators: %s is the language ISO code.
+#: ../e-util/e-spell-dictionary.c:266
+#, fuzzy, c-format
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "Descoñecido"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#, fuzzy, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%u%s)"
+
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:383
+#: ../e-util/e-spell-entry.c:384
 msgid "(no suggestions)"
 msgstr "(non hai suxestións)"
 
-#: ../e-util/e-spell-entry.c:407
+#: ../e-util/e-spell-entry.c:408
 msgid "More..."
 msgstr "Máis…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:478
+#: ../e-util/e-spell-entry.c:493
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Engadir \"%s\" ao Dicionario"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:529
+#: ../e-util/e-spell-entry.c:542
 msgid "Ignore All"
 msgstr "Ignorar todo"
 
-#: ../e-util/e-spell-entry.c:557
+#: ../e-util/e-spell-entry.c:574
 msgid "Spelling Suggestions"
 msgstr "Suxestións de ortografía"
 
@@ -11822,10 +13628,6 @@ msgid ""
 msgstr ""
 "O ficheiro xa existe en «{0}». Se o substitúe sobreescribirá o seu contido."
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "S_ubstituír"
-
 #: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
 msgstr "Non é posíbel gardar o ficheiro «{0}»."
@@ -11928,29 +13730,29 @@ msgstr ""
 "A infraestrutura de lista de tarefas que serve &quot;{0}&quot; atopou un "
 "erro."
 
-#: ../e-util/e-table-click-to-add.c:680
+#: ../e-util/e-table-click-to-add.c:684
 #: ../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"
 msgstr "prema para engadir"
 
-#: ../e-util/e-table-column-selector.c:265
+#: ../e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "Movera os nomes das columnas seleccionadas cara arriba"
 
-#: ../e-util/e-table-column-selector.c:270
+#: ../e-util/e-table-column-selector.c:269
 msgid "Move selected column names up one row"
 msgstr "Movera os nomes das columnas seleccionadas arriba unha ringleira"
 
-#: ../e-util/e-table-column-selector.c:275
+#: ../e-util/e-table-column-selector.c:274
 msgid "Move selected column names down one row"
 msgstr "Movera os nomes das columnas seleccionadas abaixo unha ringleira"
 
-#: ../e-util/e-table-column-selector.c:280
+#: ../e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "Movera os nomes das columnas seleccionadas cara abaixo"
 
-#: ../e-util/e-table-column-selector.c:285
+#: ../e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "Seleccionar todas os nomes das columnas"
 
@@ -11978,9 +13780,71 @@ msgstr "Mostrar os campos"
 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-field-chooser-dialog.c:226
-msgid "Add a Column"
-msgstr "Engadir unha columna"
+#: ../e-util/e-table-config.ui.h:2
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:281
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:191
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "_Ordenar…"
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr "_Agrupar por…"
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr "_Campos mostrados…"
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "Limp_ar todo"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr "Mo_strar o campo na vista"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "Descendente"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "Agrupar os elementos por"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "M_ostrar o campo na vista"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "Despois por"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "Mos_trar o campo na vista"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "Mostrar o campo na _visualización"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Ordenar"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "Limpar todo"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "Ordenar os elementos por"
 
 #: ../e-util/e-table-field-chooser.c:166
 msgid ""
@@ -11990,6 +13854,10 @@ msgstr ""
 "Para engadir unha columna á súa táboa, arrástrea á\n"
 "localización na que desexa que apareza."
 
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "Engadir unha columna"
+
 #: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
@@ -12004,71 +13872,67 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../e-util/e-table-header-item.c:1576
+#: ../e-util/e-table-header-item.c:1578
 msgid "Customize Current View"
 msgstr "Personalizar a vista actual"
 
-#: ../e-util/e-table-header-item.c:1599
+#: ../e-util/e-table-header-item.c:1601
 msgid "Sort _Ascending"
 msgstr "Orde _ascendente"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1604
 msgid "Sort _Descending"
 msgstr "Orde _descendente"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1607
 msgid "_Unsort"
 msgstr "Sen ord_enar"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1610
 msgid "Group By This _Field"
 msgstr "Agrupar por este ca_mpo"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1613
 msgid "Group By _Box"
 msgstr "Agrupar por cai_xa"
 
-#: ../e-util/e-table-header-item.c:1615
+#: ../e-util/e-table-header-item.c:1617
 msgid "Remove This _Column"
 msgstr "Retirar esta _columna"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1620
 msgid "Add a C_olumn..."
 msgstr "Engadir unha c_olumna…"
 
-#: ../e-util/e-table-header-item.c:1622
+#: ../e-util/e-table-header-item.c:1624
 msgid "A_lignment"
 msgstr "A_liñamento"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1627
 msgid "B_est Fit"
 msgstr "Axuste ópt_imo"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1630
 msgid "Format Column_s..."
 msgstr "Formatar as columna_s…"
 
-#: ../e-util/e-table-header-item.c:1632
+#: ../e-util/e-table-header-item.c:1634
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar a vista actual…"
 
-#: ../e-util/e-table-header-item.c:1703
+#: ../e-util/e-table-header-item.c:1705
 msgid "_Sort By"
 msgstr "O_rdenar por"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1726
+#: ../e-util/e-table-header-item.c:1728
 msgid "_Custom"
 msgstr "_Personalizar"
 
-#: ../e-util/e-text.c:2110
+#: ../e-util/e-text.c:2114
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../e-util/e-text.c:2123
-msgid "Input Methods"
-msgstr "Métodos de entrada"
-
 #. Put the "UTC" entry at the top of the combo's list.
 #: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
 #: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
@@ -12076,6 +13940,32 @@ msgstr "Métodos de entrada"
 msgid "UTC"
 msgstr "UTC"
 
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Seleccionar un fuso horario"
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Usar o botón esquerdo do rato para ampliar unha zona do mapa e escoller un "
+"fuso horario.\n"
+"Use o botón dereito para reducir."
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "Fusos horarios"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Selección"
+
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "Caixa de combinación despregábel para o fuso horario"
+
 #: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "Prema aquí para abrir o URL"
@@ -12084,72 +13974,97 @@ msgstr "Prema aquí para abrir o URL"
 msgid "Enter a URL here"
 msgstr "Escriba unha URL aquí"
 
-#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
+#: ../e-util/evolution-source-viewer.c:636
+msgid "Evolution Source Viewer"
+msgstr "Visor de fontes de Evolution"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:666
+msgid "Display Name"
+msgstr "Nome en pantalla"
+
+#: ../e-util/evolution-source-viewer.c:675
+msgid "Flags"
+msgstr "Bandeiras"
+
+#: ../e-util/evolution-source-viewer.c:727
+#: ../mail/e-mail-config-identity-page.c:676
+msgid "Identity"
+msgstr "Identidade"
+
+#: ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "_Copiar a localización da ligazón"
 
-#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
+#: ../e-util/e-web-view.c:287
 msgid "Copy the link to the clipboard"
 msgstr "Copiar a ligazón no portapapeis"
 
-#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
+#: ../e-util/e-web-view.c:295
 msgid "_Open Link in Browser"
 msgstr "_Abrir a ligazón no navegador"
 
-#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
+#: ../e-util/e-web-view.c:297
 msgid "Open the link in a web browser"
 msgstr "_Abrir a ligazón no navegador web"
 
-#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
+#: ../e-util/e-web-view.c:305
 msgid "_Copy Email Address"
 msgstr "Copiar o enderezo de _correo"
 
-#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
+#: ../e-util/e-web-view.c:322
 msgid "_Copy Image"
 msgstr "_Copiar imaxe"
 
-#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
+#: ../e-util/e-web-view.c:324
 msgid "Copy the image to the clipboard"
 msgstr "Copiar a imaxe ao portapapeis"
 
-#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
-#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1319
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "Gardar _imaxe…"
+
+#: ../e-util/e-web-view.c:331
+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:1337
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto e as imaxes"
 
-#: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
-#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:994
-#: ../e-util/e-web-view.c:996 ../e-util/e-web-view.c:998
+#: ../e-util/e-web-view.c:1001
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar a %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
+#: ../e-util/e-web-view.c:1003
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar/mostrar os enderezos"
 
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
+#: ../e-util/e-web-view.c:1014
+#, fuzzy, c-format
+msgid "Go to the section %s of the message"
+msgstr "Introducir os destinatarios da mensaxe"
+
+#: ../e-util/e-web-view.c:1016
+#, fuzzy
+msgid "Go to the beginning of the message"
+msgstr "Introducir os destinatarios da mensaxe"
+
+#: ../e-util/e-web-view.c:1020
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
 
-#: ../e-util/e-web-view.c:326
-msgid "Save _Image..."
-msgstr "Gardar _imaxe…"
-
-#: ../e-util/e-web-view.c:328
-msgid "Save the image to a file"
-msgstr "Gardar a imaxe a un ficheiro"
-
-#: ../e-util/e-web-view.c:2902
+#: ../e-util/e-web-view.c:2853
 msgid "Copying image to clipboard"
 msgstr "Copiar imaxe ao portapapeis"
 
-#: ../e-util/e-web-view.c:3090
+#: ../e-util/e-web-view.c:3041
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#: ../e-util/e-web-view.c:3126
+#: ../e-util/e-web-view.c:3077
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Gardando imaxe en «%s»"
@@ -12170,37 +14085,6 @@ msgstr "Desfacer «Eliminar texto»"
 msgid "Redo 'Delete text'"
 msgstr "Refacer «Eliminar texto»"
 
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
-msgid "%d %B %Y"
-msgstr "%d de %B de %Y"
-
-#: ../e-util/ea-calendar-item.c:326
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Calendario: desde %s até %s"
-
-#: ../e-util/ea-calendar-item.c:363
-msgid "evolution calendar item"
-msgstr "elemento de calendario do Evolution"
-
-#: ../e-util/evolution-source-viewer.c:636
-msgid "Evolution Source Viewer"
-msgstr "Visor de fontes de Evolution"
-
-#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:666
-msgid "Display Name"
-msgstr "Nome en pantalla"
-
-#: ../e-util/evolution-source-viewer.c:675
-msgid "Flags"
-msgstr "Bandeiras"
-
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:677
-msgid "Identity"
-msgstr "Identidade"
-
 #: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Falta a data."
@@ -12261,6 +14145,83 @@ msgstr "Falta un valor."
 msgid "One or more values cannot be empty."
 msgstr "Un ou máis valores non poden ser baleiros."
 
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "o instante actual"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "o instante que indique"
+
+#: ../e-util/filter.ui.h:4
+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:85
+msgid "seconds"
+msgstr "segundos"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "semanas"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "meses"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "anos"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "hai"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "no futuro"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Mostrar os filtros para o correo:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "Regras de _filtro"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "Comparar con"
+
+#: ../e-util/filter.ui.h:24
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"A data da mensaxe compararase co\n"
+"instante actual no que se produce o filtrado."
+
+#: ../e-util/filter.ui.h:26
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"A data da mensaxe compararase coas\n"
+"12:00am da data indicada."
+
+#: ../e-util/filter.ui.h:28
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"A data da mensaxe compararase co\n"
+"instante relativo no que se produce o filtrado."
+
+#: ../e-util/gal-a11y-e-cell.c:122
+msgid "Table Cell"
+msgstr "Cela da táboa"
+
 #. Translators: description of a "popup" action
 #: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
@@ -12281,10 +14242,6 @@ msgstr "expande a fila no ETree que contén esta cela"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contrae a fila no ETree que contén esta cela"
 
-#: ../e-util/gal-a11y-e-cell.c:122
-msgid "Table Cell"
-msgstr "Cela da táboa"
-
 #: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "premer"
@@ -12297,6 +14254,14 @@ msgstr "ordenar"
 msgid "Save Current View"
 msgstr "Gardar a vista actual"
 
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Crear unha vista nova"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "Substituí_r a vista existente"
+
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "Desexa gardar as modificacións?"
@@ -12333,6 +14298,28 @@ msgstr "Non foi posíbel cargar a sinatura."
 msgid "Could not save signature."
 msgstr "Non foi posíbel gardar a sinatura."
 
+#: ../evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution é un aplicativo de xestión de información persoal que lle fornece "
+"funcionalidades integradas de correo electrónico, calendario e axenda de "
+"enderezos."
+
+#: ../evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+"Evolution admite un amplo conxunto de formatos de datos estándar na "
+"industria e protocolos estándares de intercambio de información, xa que lle "
+"fornece un gran apoio ao cumplimento de estándares e seguridade. Evolution "
+"tamén pode integrarse perfectamente con Microsoft Exchange empregando a "
+"extensión \"Exchange Web Services\" (EWS)."
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -12398,68 +14385,37 @@ msgstr[1] "Gardando %d mensaxes"
 msgid "Invalid folder URI '%s'"
 msgstr "O URI do cartafol «%s» non é válido"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
-msgid "No mail transport service available"
-msgstr "Non hai un servizo de transporte de correo dispoñíbel"
-
-#: ../libemail-engine/e-mail-session-utils.c:639
-#: ../libemail-engine/mail-ops.c:707
-#, 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:688
-#: ../libemail-engine/mail-ops.c:750
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-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:714
-#: ../libemail-engine/mail-ops.c:774
-#, 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:915
-#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
-msgid "Sending message"
-msgstr "Enviando a mensaxe"
-
 #: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1160
-#: ../modules/mail/e-mail-shell-view-private.c:1060
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../mail/em-folder-tree-model.c:1174
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1167
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Borradores"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
-#: ../modules/mail/e-mail-shell-view-private.c:1062
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1178
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Caixa de saída"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1182
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Enviados"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
-#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1170
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
-#: ../plugins/templates/templates.c:1389
+#: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432
+#: ../plugins/templates/templates.c:1442
 msgid "Templates"
 msgstr "Modelos"
 
@@ -12492,6 +14448,37 @@ msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 "Non se atopou ningunha identidade que usar, cancelouse o reenvío do mensaxe."
 
+#: ../libemail-engine/e-mail-session-utils.c:539
+msgid "No mail transport service available"
+msgstr "Non hai un servizo de transporte de correo dispoñíbel"
+
+#: ../libemail-engine/e-mail-session-utils.c:659
+#: ../libemail-engine/mail-ops.c:730
+#, 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:708
+#: ../libemail-engine/mail-ops.c:773
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+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:734
+#: ../libemail-engine/mail-ops.c:797
+#, 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:935
+#: ../libemail-engine/mail-ops.c:942 ../libemail-engine/mail-ops.c:1044
+msgid "Sending message"
+msgstr "Enviando a mensaxe"
+
 #: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -12529,7 +14516,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Obtendo o correo de «%s»"
 
-#: ../libemail-engine/mail-ops.c:701
+#: ../libemail-engine/mail-ops.c:724
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12542,52 +14529,52 @@ msgstr ""
 "Comprobe os seus filtros en Editar->Filtros de mensaxes.\n"
 "O erro orixinal foi: %s"
 
-#: ../libemail-engine/mail-ops.c:917
+#: ../libemail-engine/mail-ops.c:953
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../libemail-engine/mail-ops.c:969
+#: ../libemail-engine/mail-ops.c:1005
 #, 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:975
+#: ../libemail-engine/mail-ops.c:1011
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../libemail-engine/mail-ops.c:977
+#: ../libemail-engine/mail-ops.c:1013
 msgid "Complete."
 msgstr "Completado."
 
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1125
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a «%s»"
 
-#: ../libemail-engine/mail-ops.c:1090
+#: ../libemail-engine/mail-ops.c:1126
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a «%s»"
 
-#: ../libemail-engine/mail-ops.c:1209
+#: ../libemail-engine/mail-ops.c:1245
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gardando o cartafol «%s»"
 
-#: ../libemail-engine/mail-ops.c:1337
+#: ../libemail-engine/mail-ops.c:1373
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expurgando e gardando a conta «%s»"
 
-#: ../libemail-engine/mail-ops.c:1338
+#: ../libemail-engine/mail-ops.c:1374
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Gardando a conta «%s»"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1449
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo de «%s»"
@@ -12652,45 +14639,38 @@ msgstr "Abrir _Contas en liña"
 msgid "This account was created through the Online Accounts service."
 msgstr "Esta conta creouse mediante o servizo de Contas en liña."
 
-#: ../mail/e-mail-account-manager.c:690
+#: ../mail/e-mail-account-manager.c:689
 msgid "_Reset Order"
 msgstr "_Restabelecer orde"
 
-#: ../mail/e-mail-account-manager.c:703
+#: ../mail/e-mail-account-manager.c:702
 msgid "You can drag and drop account names to reorder them."
 msgstr "Pode arrastrar e soltar nomes de contas para reordenalas."
 
-#: ../mail/e-mail-account-manager.c:746
+#: ../mail/e-mail-account-manager.c:745
 msgid "De_fault"
 msgstr "Prede_finido"
 
-#: ../mail/e-mail-account-tree-view.c:84
-#: ../modules/mail/em-composer-prefs.c:1191
+#: ../mail/e-mail-account-tree-view.c:83
+#: ../modules/mail/em-composer-prefs.c:1173
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
 #: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../mail/e-mail-account-tree-view.c:108
+#: ../mail/e-mail-account-tree-view.c:107
 msgid "Account Name"
 msgstr "Nome da conta"
 
-#: ../mail/e-mail-account-tree-view.c:135
-#: ../mail/e-mail-config-security-page.c:424
-#: ../mail/e-mail-config-security-page.c:564 ../mail/e-mail-reader.c:3602
-#: ../mail/mail-config.ui.h:66
-msgid "Default"
-msgstr "predeterminado"
-
-#: ../mail/e-mail-autoconfig.c:611
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "Non se forneceu ningún enderezo de correo"
 
-#: ../mail/e-mail-autoconfig.c:620
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "Falta o dominio no enderezo de correo"
 
-#: ../mail/e-mail-backend.c:841
+#: ../mail/e-mail-backend.c:855
 msgid "Unknown background operation"
 msgstr "Operación en segundo plano descoñecida"
 
@@ -12713,19 +14693,19 @@ msgstr "_Atrás"
 msgid "_Skip Lookup"
 msgstr "_Omitir busca"
 
-#: ../mail/e-mail-config-assistant.c:654
+#: ../mail/e-mail-config-assistant.c:653
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
-#: ../mail/e-mail-config-assistant.c:936
+#: ../mail/e-mail-config-assistant.c:935
 msgid "_Revise Details"
 msgstr "_Revisar detalles"
 
-#: ../mail/e-mail-config-auth-check.c:350
+#: ../mail/e-mail-config-auth-check.c:349
 msgid "Check for Supported Types"
 msgstr "Comprobar tipos admitidos"
 
-#: ../mail/e-mail-config-confirm-page.c:156
+#: ../mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12740,91 +14720,91 @@ msgstr ""
 "\n"
 "Prema en «Aplicar» para gardar os axustes."
 
-#: ../mail/e-mail-config-confirm-page.c:168
+#: ../mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../mail/e-mail-config-defaults-page.c:548
 msgid "Special Folders"
 msgstr "Cartafoles especiais"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:557
 msgid "Draft Messages _Folder:"
 msgstr "Cartafol das _mensaxes enviadas:"
 
-#: ../mail/e-mail-config-defaults-page.c:568
+#: ../mail/e-mail-config-defaults-page.c:567
 msgid "Choose a folder for saving draft messages."
 msgstr "Seleccione un cartafol no que gardar os borradores."
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:581
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol das _mensaxes enviadas:"
 
-#: ../mail/e-mail-config-defaults-page.c:592
+#: ../mail/e-mail-config-defaults-page.c:591
 msgid "Choose a folder for saving sent messages."
 msgstr "Seleccione un cartafol no que gardar os mensaxes enviados."
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:610
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "G_argar respostas no cartafol da mensaxe respondida"
 
-#: ../mail/e-mail-config-defaults-page.c:628
+#: ../mail/e-mail-config-defaults-page.c:627
 msgid "_Restore Defaults"
 msgstr "_Restaurar valores predeterminados"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:641
 msgid "Use a Real Folder for _Trash:"
 msgstr "Usar un cartafol real para o _Lixo:"
 
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../mail/e-mail-config-defaults-page.c:642
 msgid "Choose a folder for deleted messages."
 msgstr "Seleccione un cartafol no que gardar as mensaxes eliminadas."
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:651
 msgid "Use a Real Folder for _Junk:"
 msgstr "Usar un cartafol real para o _lixo:"
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "Choose a folder for junk messages."
 msgstr "Seleccione un cartafol para o spam."
 
-#: ../mail/e-mail-config-defaults-page.c:670
+#: ../mail/e-mail-config-defaults-page.c:669
 msgid "Composing Messages"
 msgstr "Escribir unha mensaxe"
 
-#: ../mail/e-mail-config-defaults-page.c:679
+#: ../mail/e-mail-config-defaults-page.c:678
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar _sempre unha copia de carbón (Cc) a:"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:703
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre unha copia de carbón _oculta (Cco) a:"
 
-#: ../mail/e-mail-config-defaults-page.c:739
+#: ../mail/e-mail-config-defaults-page.c:738
 msgid "Message Receipts"
 msgstr "Confirmacións de lectura das mensaxes"
 
-#: ../mail/e-mail-config-defaults-page.c:748
+#: ../mail/e-mail-config-defaults-page.c:747
 msgid "S_end message receipts:"
 msgstr "_Enviar as confirmacións de lectura das mensaxes:"
 
-#: ../mail/e-mail-config-defaults-page.c:773
+#: ../mail/e-mail-config-defaults-page.c:772
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/e-mail-config-defaults-page.c:779
+#: ../mail/e-mail-config-defaults-page.c:778
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/e-mail-config-defaults-page.c:785
+#: ../mail/e-mail-config-defaults-page.c:784
 msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
-#: ../mail/e-mail-config-defaults-page.c:856
+#: ../mail/e-mail-config-defaults-page.c:855
 msgid "Defaults"
 msgstr "Predefinicións"
 
-#: ../mail/e-mail-config-identity-page.c:265
+#: ../mail/e-mail-config-identity-page.c:264
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12834,13 +14814,13 @@ msgstr ""
 "necesitan encherse, a non ser que desexe incluír esta información no correo "
 "que envíe."
 
-#: ../mail/e-mail-config-identity-page.c:293
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../mail/e-mail-config-identity-page.c:292
+#: ../mail/e-mail-config-summary-page.c:322
 msgid "Account Information"
 msgstr "Información da conta"
 
-#: ../mail/e-mail-config-identity-page.c:302
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../mail/e-mail-config-identity-page.c:301
+#: ../mail/e-mail-config-summary-page.c:331
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -12848,36 +14828,36 @@ msgstr ""
 "Escriba o nome polo que quere identificar esta conta.\n"
 "Por exemplo: «Traballo» ou «Persoal»"
 
-#: ../mail/e-mail-config-identity-page.c:347
+#: ../mail/e-mail-config-identity-page.c:346
 msgid "Required Information"
 msgstr "Información solicitada"
 
-#: ../mail/e-mail-config-identity-page.c:356
+#: ../mail/e-mail-config-identity-page.c:355
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/e-mail-config-identity-page.c:383
+#: ../mail/e-mail-config-identity-page.c:382
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../mail/e-mail-config-identity-page.c:430
+#: ../mail/e-mail-config-identity-page.c:429
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Información opcional"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:438
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:465
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:520
 msgid "Add Ne_w Signature..."
 msgstr "Engadir unha sinatura _nova…"
 
-#: ../mail/e-mail-config-lookup-page.c:67
+#: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Buscando polos detalles da conta..."
 
@@ -12889,7 +14869,7 @@ msgstr "Comprobando se hai correo novo"
 msgid "Check for _new messages every"
 msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/e-mail-config-provider-page.c:699
+#: ../mail/e-mail-config-provider-page.c:698
 msgid "Receiving Options"
 msgstr "Opcións de recepción"
 
@@ -12901,105 +14881,104 @@ msgstr "Recepción de correo"
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
 #: ../mail/e-mail-config-security-page.c:251
 #, c-format
-#| msgid "Task - %s"
 msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
-#: ../modules/addressbook/autocompletion-config.c:113
+#: ../mail/e-mail-config-security-page.c:340
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Xeral"
 
-#: ../mail/e-mail-config-security-page.c:347
+#: ../mail/e-mail-config-security-page.c:349
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "Non asinar as solicitudes _de reunión (para a compatibilidade co Outlook)"
 
-#: ../mail/e-mail-config-security-page.c:369
+#: ../mail/e-mail-config-security-page.c:371
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:378
+#: ../mail/e-mail-config-security-page.c:380
 msgid "OpenPGP _Key ID:"
 msgstr "ID da _chave OpenPGP:"
 
-#: ../mail/e-mail-config-security-page.c:411
+#: ../mail/e-mail-config-security-page.c:413
 msgid "Si_gning algorithm:"
 msgstr "Algoritmo da si_natura:"
 
-#: ../mail/e-mail-config-security-page.c:427
-#: ../mail/e-mail-config-security-page.c:567 ../mail/mail-config.ui.h:67
+#: ../mail/e-mail-config-security-page.c:429
+#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:69
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:430
-#: ../mail/e-mail-config-security-page.c:570 ../mail/mail-config.ui.h:68
+#: ../mail/e-mail-config-security-page.c:432
+#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:70
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:433
-#: ../mail/e-mail-config-security-page.c:573 ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:435
+#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:71
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:436
-#: ../mail/e-mail-config-security-page.c:576 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:438
+#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:72
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:452
+#: ../mail/e-mail-config-security-page.c:454
 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:464
+#: ../mail/e-mail-config-security-page.c:466
 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:476
+#: ../mail/e-mail-config-security-page.c:478
 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:500
+#: ../mail/e-mail-config-security-page.c:502
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:509
+#: ../mail/e-mail-config-security-page.c:511
 msgid "Sig_ning certificate:"
 msgstr "Certificado de si_natura:"
 
-#: ../mail/e-mail-config-security-page.c:533
-#: ../mail/e-mail-config-security-page.c:639
+#: ../mail/e-mail-config-security-page.c:535
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../mail/e-mail-config-security-page.c:542
-#: ../mail/e-mail-config-security-page.c:648 ../mail/mail-dialogs.ui.h:5
+#: ../mail/e-mail-config-security-page.c:544
+#: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
 #: ../shell/e-shell-window-actions.c:1007
 msgid "_Clear"
 msgstr "Limpa_r"
 
-#: ../mail/e-mail-config-security-page.c:551
+#: ../mail/e-mail-config-security-page.c:553
 msgid "Signing _algorithm:"
 msgstr "_Algoritmo da sinatura:"
 
-#: ../mail/e-mail-config-security-page.c:592
+#: ../mail/e-mail-config-security-page.c:594
 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:615
+#: ../mail/e-mail-config-security-page.c:617
 msgid "Encryption certificate:"
 msgstr "Certificado de cifrado:"
 
-#: ../mail/e-mail-config-security-page.c:657
+#: ../mail/e-mail-config-security-page.c:659
 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:677
+#: ../mail/e-mail-config-security-page.c:679
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Cifrar sempre para min mesmo ao enviar correo cifrado"
 
@@ -13007,7 +14986,7 @@ msgstr "Cifrar sempre para min mesmo ao enviar correo cifrado"
 msgid "Sending Email"
 msgstr "Envío de correo"
 
-#: ../mail/e-mail-config-service-page.c:639
+#: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
@@ -13019,52 +14998,52 @@ msgstr "SSL"
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:306
+#: ../mail/e-mail-config-summary-page.c:305
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Este é un resumo da configuración que se empregarán para acceder ao seu "
 "correo."
 
-#: ../mail/e-mail-config-summary-page.c:371
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Detalles persoais"
 
-#: ../mail/e-mail-config-summary-page.c:380
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Nome completo"
 
-#: ../mail/e-mail-config-summary-page.c:394
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "Enderezo de correo"
 
-#: ../mail/e-mail-config-summary-page.c:408
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Recibindo"
 
-#: ../mail/e-mail-config-summary-page.c:420
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Enviando"
 
-#: ../mail/e-mail-config-summary-page.c:432
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Tipo de servidor:"
 
-#: ../mail/e-mail-config-summary-page.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../mail/e-mail-config-summary-page.c:474
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Username:"
 msgstr "Nome do usuario:"
 
-#: ../mail/e-mail-config-summary-page.c:495
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Seguranza:"
 
-#: ../mail/e-mail-config-summary-page.c:786
+#: ../mail/e-mail-config-summary-page.c:785
 msgid "Account Summary"
 msgstr "Resumo da conta"
 
@@ -13083,37 +15062,51 @@ msgstr ""
 msgid "Welcome"
 msgstr "Benvido/a"
 
-#: ../mail/e-mail-config-window.c:326
+#: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/e-mail-display.c:95
+#: ../mail/e-mail-display.c:97
 msgid "_Add to Address Book..."
 msgstr "Eng_adir á axenda de enderezos…"
 
-#: ../mail/e-mail-display.c:102
+#: ../mail/e-mail-display.c:104
 msgid "_To This Address"
 msgstr "A es_te enderezo"
 
-#: ../mail/e-mail-display.c:109
+#: ../mail/e-mail-display.c:111
 msgid "_From This Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/e-mail-display.c:116
+#: ../mail/e-mail-display.c:118
 msgid "Send _Reply To..."
 msgstr "Enviar _resposta a…"
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:120
 msgid "Send a reply message to this address"
 msgstr "Enviar unha mensaxe de resposta a este enderezo"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:127
 msgid "Create Search _Folder"
 msgstr "Crear un carta_fol de busca"
 
-#. Label + combo box has a 12px left margin so it's
-#. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:297
+#: ../mail/e-mail-folder-create-dialog.c:327
+msgid "Create Folder"
+msgstr "Crear un cartafol"
+
+#: ../mail/e-mail-folder-create-dialog.c:331
+msgid "Specify where to create the folder:"
+msgstr "Indicar onde crear o cartafol:"
+
+#: ../mail/e-mail-folder-create-dialog.c:334
+msgid "C_reate"
+msgstr "C_rear"
+
+#: ../mail/e-mail-folder-create-dialog.c:351
+msgid "Folder _name:"
+msgstr "_Nome do cartafol:"
+
+#: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "Software de filtrado de SPAM:"
 
@@ -13146,7 +15139,7 @@ msgid "_Later"
 msgstr "_Máis tarde"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
 msgid "Add Label"
 msgstr "Engadir unha etiqueta"
 
@@ -13166,35 +15159,35 @@ msgstr ""
 msgid "Color"
 msgstr "Cor"
 
-#: ../mail/e-mail-print-config-headers.c:166
+#: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "Mover as cabeceiras seleccionadas á parte superior"
 
-#: ../mail/e-mail-print-config-headers.c:171
+#: ../mail/e-mail-print-config-headers.c:170
 msgid "Move selected headers up one row"
 msgstr "Mover as cabeceiras seleccionadas arriba unha ringleira"
 
-#: ../mail/e-mail-print-config-headers.c:176
+#: ../mail/e-mail-print-config-headers.c:175
 msgid "Move selected headers down one row"
 msgstr "Mover as cabeceiras seleccionadas abaixo unha ringleira"
 
-#: ../mail/e-mail-print-config-headers.c:181
+#: ../mail/e-mail-print-config-headers.c:180
 msgid "Move selected headers to bottom"
 msgstr "Mover as cabeceiras seleccionadas á parte inferior"
 
-#: ../mail/e-mail-print-config-headers.c:186
+#: ../mail/e-mail-print-config-headers.c:185
 msgid "Select all headers"
 msgstr "Seleccionar todas as cabeceiras"
 
-#: ../mail/e-mail-print-config-headers.c:205
+#: ../mail/e-mail-print-config-headers.c:204
 msgid "Header Name"
 msgstr "Nome da cabeceira:"
 
-#: ../mail/e-mail-print-config-headers.c:214
+#: ../mail/e-mail-print-config-headers.c:213
 msgid "Header Value"
 msgstr "Valor da cabecera"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:110
 msgid "Headers"
 msgstr "Cabeceiras"
 
@@ -13203,600 +15196,600 @@ msgstr "Cabeceiras"
 msgid "Page %d of %d"
 msgstr "Páxina %d de %d"
 
-#: ../mail/e-mail-reader.c:348 ../mail/filtertypes.xml.in.h:62
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:848 ../mail/filtertypes.xml.in.h:61
+#: ../mail/e-mail-reader.c:848 ../mail/filtertypes.xml.in.h:62
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:852 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:1173 ../mail/e-mail-reader.c:1385
+#: ../mail/e-mail-reader.c:1425
 msgid "_Do not ask me again."
 msgstr "_Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1431
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar sempre «Responder a:» para as listas de correo."
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1633
 msgid "Failed to retrieve message:"
 msgstr "Produciuse un erro ao obter a mensaxe:"
 
-#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
+#: ../mail/e-mail-reader.c:1678 ../mail/e-mail-reader.c:2855
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando a mensaxe «%s»"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1866
 msgid "A_dd Sender to Address Book"
 msgstr "Enga_dir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1864
+#: ../mail/e-mail-reader.c:1868
 msgid "Add sender to address book"
 msgstr "Engadir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1873
 msgid "Check for _Junk"
 msgstr "Comprobar se hai correo li_xo"
 
-#: ../mail/e-mail-reader.c:1871
+#: ../mail/e-mail-reader.c:1875
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo lixo"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1880
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafol…"
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1882
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1887
 msgid "_Delete Message"
 msgstr "E_liminar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1889
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1894
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Crear unha regra de filtrado segundo a _rolda de correo…"
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1896
 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:1897
+#: ../mail/e-mail-reader.c:1901
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Crear unha regra de filtrado segundo os _destinatarios…"
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1903
 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:1904
+#: ../mail/e-mail-reader.c:1908
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Crear unha regra de filtrado segundo o re_mitente…"
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1910
 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:1911
+#: ../mail/e-mail-reader.c:1915
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Crear unha regra de filtrado segundo o _asunto…"
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1917
 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:1918
+#: ../mail/e-mail-reader.c:1922
 msgid "A_pply Filters"
 msgstr "_Aplicar os filtros"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1924
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtrado ás mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1929
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxe…"
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1931
 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:1932
+#: ../mail/e-mail-reader.c:1936
 msgid "_Clear Flag"
 msgstr "E_liminar a marca"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1938
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Retirar as marcas de seguimento das mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1943
 msgid "_Flag Completed"
 msgstr "_Marcar como completado"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1945
 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:1946
+#: ../mail/e-mail-reader.c:1950
 msgid "Follow _Up..."
 msgstr "Seguimento…"
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1952
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1957
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1959 ../mail/e-mail-reader.c:1966
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reencamiñar a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1964
 msgid "Forward As _Attached"
 msgstr "Reencamiñar como un _anexo"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1971
 msgid "_Inline"
 msgstr "_Inserida"
 
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1973 ../mail/e-mail-reader.c:1980
 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:1974
+#: ../mail/e-mail-reader.c:1978
 msgid "Forward As _Inline"
 msgstr "Reencamiñar _inserida"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1985
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1987 ../mail/e-mail-reader.c:1994
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reencamiñar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1992
 msgid "Forward As _Quoted"
 msgstr "Reencamiñar _citada"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1999
 msgid "_Load Images"
 msgstr "_Cargar as imaxes"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2001
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2006
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2008
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2013
 msgid "_Junk"
 msgstr "_Correo lixo"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2015
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo lixo"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2020
 msgid "_Not Junk"
 msgstr "_Non é correo lixo"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2022
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2027
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2029
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2034
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2036
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2041
 msgid "_Unread"
 msgstr "_Sen ler"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2043
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2048
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe nova…"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2050
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2055
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2057
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para escribir unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2062
 msgid "_Open in New Window"
 msgstr "Abrir nunha xanela n_ova"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2064
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2069
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafol…"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2071
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2076
 msgid "_Next Message"
 msgstr "Segui_nte mensaxe"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2078
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2083
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2085
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2090
 msgid "Next _Thread"
 msgstr "Seguin_te fío"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2092
 msgid "Display the next thread"
 msgstr "Mostrar o seguinte fío"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2097
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _sen ler"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2099
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2104
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2106
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2111
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2113
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2118
 msgid "Previous T_hread"
 msgstr "_Conversa anterior"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2120
 msgid "Display the previous thread"
 msgstr "Mostrar o fío anterior"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2125
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe sen ler"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2127
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2134
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2141
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2146
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2148
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguén a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2153
 msgid "Remo_ve Attachments"
 msgstr "Eliminar os _anexos"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2155
 msgid "Remove attachments"
 msgstr "Retirar os anexos"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2160
 msgid "Remove Du_plicate Messages"
 msgstr "Retirar as mensaxes du_plicadas"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2162
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar se hai mensaxes seleccionadas que estean duplicadas"
 
-#: ../mail/e-mail-reader.c:2163 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../mail/e-mail-reader.c:2167 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2169
 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:2170 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2174 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Responder á _lista"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2176
 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:2177
+#: ../mail/e-mail-reader.c:2181
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2183
 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:2184
+#: ../mail/e-mail-reader.c:2188
 msgid "_Save as mbox..."
 msgstr "Gardar como mbox…"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2190
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes seleccionadas como un ficheiro mbox"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2195
 msgid "_Message Source"
 msgstr "Fonte da _mensaxe"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2197
 msgid "Show the raw email source of the message"
 msgstr "Mostrar a fonte en bruto da mensaxe"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2209
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2211
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2216
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2218
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaño orixinal"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2223
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2225
 msgid "Increase the text size"
 msgstr "Aumentar o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2232
 msgid "Decrease the text size"
 msgstr "Diminuír o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2239
 msgid "Cre_ate"
 msgstr "Cre_ar"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2246
 msgid "Ch_aracter Encoding"
 msgstr "Codificación de car_acteres"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2253
 msgid "F_orward As"
 msgstr "Reencamiñar c_omo…"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2260
 msgid "_Group Reply"
 msgstr "_Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2267
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../mail/e-mail-reader.c:2274
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2281
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2288
 msgid "_Zoom"
 msgstr "A_mpliar"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2298
 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:2296
+#: ../mail/e-mail-reader.c:2300
 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:2301
+#: ../mail/e-mail-reader.c:2305
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Crear un cartafol de busca segundo os des_tinatarios…"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2307
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2312
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Crear un cartafol de busca segundo o _remitente…"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2314
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2319
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Crear un cartafol de busca segundo o as_unto…"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2321
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2344
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimento…"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2352
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2356
 msgid "Mark as _Junk"
 msgstr "Marcar como correo l_ixo"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2360
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo lixo"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2364
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2368
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2372
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2416
 msgid "_Caret Mode"
 msgstr "Activar o _cursor"
 
-#: ../mail/e-mail-reader.c:2414
+#: ../mail/e-mail-reader.c:2418
 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:2420
+#: ../mail/e-mail-reader.c:2424
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2426
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrónico"
 
-#: ../mail/e-mail-reader.c:2849
+#: ../mail/e-mail-reader.c:2861
 msgid "Retrieving message"
 msgstr "Descargando mensaxe"
 
-#: ../mail/e-mail-reader.c:3772
+#: ../mail/e-mail-reader.c:3826
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Reencamiñar"
 
-#: ../mail/e-mail-reader.c:3773
+#: ../mail/e-mail-reader.c:3827
 msgid "Forward the selected message to someone"
 msgstr "Reencamiñar a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:3792
+#: ../mail/e-mail-reader.c:3846
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:3793
+#: ../mail/e-mail-reader.c:3847
 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:3859 ../mail/filtertypes.xml.in.h:63
+#: ../mail/e-mail-reader.c:3913 ../mail/filtertypes.xml.in.h:64
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:3871
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../mail/e-mail-reader.c:3925
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:3875
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../mail/e-mail-reader.c:3929
+#: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3938 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader-utils.c:147
+#: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Non avisarme de novo."
 
-#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
-#: ../smime/gui/certificate-manager.c:329
+#: ../mail/e-mail-reader-utils.c:556 ../plugins/face/face.c:170
+#: ../smime/gui/certificate-manager.c:341
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../mail/e-mail-reader-utils.c:976
+#: ../mail/e-mail-reader-utils.c:973
 msgid "Printing"
 msgstr "Imprimindo"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1211
+#: ../mail/e-mail-reader-utils.c:1208
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13811,7 +15804,7 @@ msgstr[1] ""
 "O cartafol «%s» contén %u mensaxes duplicadas. Ten certeza de que quere "
 "eliminalas?"
 
-#: ../mail/e-mail-reader-utils.c:2026
+#: ../mail/e-mail-reader-utils.c:2023
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe"
@@ -13822,13 +15815,13 @@ 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:2047
+#: ../mail/e-mail-reader-utils.c:2044
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
 msgstr[1] "Mensaxes"
 
-#: ../mail/e-mail-reader-utils.c:2416
+#: ../mail/e-mail-reader-utils.c:2413
 msgid "Parsing message"
 msgstr "Analizando mensaxe"
 
@@ -13844,7 +15837,7 @@ msgstr "Marcar para facer seguimento"
 #. * 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:1454
+#: ../mail/em-composer-utils.c:1491
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13852,23 +15845,24 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} ás ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:1460
+#: ../mail/em-composer-utils.c:1497
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reencamiñada --------"
 
-#: ../mail/em-composer-utils.c:1465
+#: ../mail/em-composer-utils.c:1502
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2615
+#: ../mail/em-composer-utils.c:2652
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
-#: ../mail/em-composer-utils.c:3040
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3047
 msgid "Posting destination"
 msgstr "Destino da publicación"
 
-#: ../mail/em-composer-utils.c:3041
+#: ../mail/em-composer-utils.c:3052
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
@@ -13921,13 +15915,10 @@ msgstr "Propiedades do cartafol"
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
-#: ../mail/em-folder-selector.c:387
-msgid "C_reate"
-msgstr "C_rear"
-
-#: ../mail/em-folder-selector.c:393
-msgid "Folder _name:"
-msgstr "_Nome do cartafol:"
+#: ../mail/em-folder-selector.c:398
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Crear un novo cartafol de correo"
 
 #: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
@@ -13939,31 +15930,31 @@ msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1667
+#: ../mail/em-folder-tree.c:1668
 msgid "Mail Folder Tree"
 msgstr "Árbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:2215 ../mail/em-folder-utils.c:100
+#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:2218 ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando o cartafol %s"
 
-#: ../mail/em-folder-tree.c:2225 ../mail/message-list.c:2284
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2309
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:2229 ../mail/message-list.c:2286
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2311
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:2248
+#: ../mail/em-folder-tree.c:2249
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non é posíbel soltar as mensaxe(s) no almacenamento do nivel superior"
@@ -13973,26 +15964,18 @@ msgstr "Non é posíbel soltar as mensaxe(s) no almacenamento do nivel superior"
 msgid "UNMATCHED"
 msgstr "SEN COINCIDENCIAS"
 
-#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
+#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
 msgid "Loading..."
 msgstr "Cargando…"
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Mover o cartafol a"
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Copiar o cartafol a"
 
-#: ../mail/em-folder-utils.c:604
-msgid "Create Folder"
-msgstr "Crear un cartafol"
-
-#: ../mail/em-folder-utils.c:605
-msgid "Specify where to create the folder:"
-msgstr "Indicar onde crear o cartafol:"
-
 #: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "Su_bscribir"
@@ -14006,7 +15989,7 @@ 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:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "_Unsubscribe"
 msgstr "Cancelar a s_ubscrición"
 
@@ -14043,7 +16026,7 @@ msgid "Su_bscribe"
 msgstr "Su_bscribir"
 
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Unsubscribe from the selected folder"
 msgstr "Cancelar a subscrición ao cartafol seleccionado"
 
@@ -14068,8 +16051,8 @@ 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:1533
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "_Refresh"
 msgstr "_Actualizar"
 
@@ -14078,7 +16061,7 @@ msgid "Stop the current operation"
 msgstr "Deter a operación actual"
 
 #: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "_Stop"
 msgstr "_Deter"
 
@@ -14093,11 +16076,6 @@ 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:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "_Non mostrar esta mensaxe outra vez"
-
 #: ../mail/em-utils.c:241
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
@@ -14115,31 +16093,31 @@ msgstr "Carta_foles de busca"
 msgid "Add Folder"
 msgstr "Engadir un cartafol"
 
-#: ../mail/em-vfolder-editor-rule.c:518
+#: ../mail/em-vfolder-editor-rule.c:521
 msgid "Search Folder Sources"
 msgstr "Fontes do cartafol de busca"
 
-#: ../mail/em-vfolder-editor-rule.c:550
+#: ../mail/em-vfolder-editor-rule.c:553
 msgid "Automatically update on any _source folder change"
 msgstr "Actualizar automaticamente se hai calquera _cambio no cartafol fonte"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "All local folders"
 msgstr "Todos os cartafoles locais"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:566
 msgid "All active remote folders"
 msgstr "Todos os cartafoles remotos activos"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local and active remote folders"
 msgstr "Todos os cartafoles locais e remotos activos"
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "Specific folders"
 msgstr "Cartafoles específicos"
 
-#: ../mail/em-vfolder-editor-rule.c:603
+#: ../mail/em-vfolder-editor-rule.c:606
 msgid "include subfolders"
 msgstr "incluír subcartafoles"
 
@@ -14273,11 +16251,6 @@ msgstr "Tamaño (KB)"
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:38
-#: ../mail/vfoldertypes.xml.in.h:38
-msgid "Draft"
-msgstr "Borrador"
-
 #: ../mail/filtertypes.xml.in.h:36 ../mail/searchtypes.xml.in.h:39
 #: ../mail/vfoldertypes.xml.in.h:39
 msgid "Important"
@@ -14289,7 +16262,7 @@ msgstr "Importante"
 msgid "Read"
 msgstr "Ler"
 
-#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-config.ui.h:113
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-config.ui.h:117
 #: ../mail/vfoldertypes.xml.in.h:41
 msgid "Junk"
 msgstr "Correo lixo"
@@ -14375,61 +16348,65 @@ msgstr "A mensaxe é un correo lixo"
 msgid "Message is not Junk"
 msgstr "A mensaxe non é un correo lixo"
 
-#: ../mail/filtertypes.xml.in.h:60 ../mail/searchtypes.xml.in.h:53
+#: ../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:61 ../mail/searchtypes.xml.in.h:53
 #: ../mail/vfoldertypes.xml.in.h:55
 msgid "Match All"
 msgstr "Coincidir todo"
 
-#: ../mail/filtertypes.xml.in.h:64
+#: ../mail/filtertypes.xml.in.h:65
 msgid "Stop Processing"
 msgstr "Deter o procesamento"
 
-#: ../mail/filtertypes.xml.in.h:65
+#: ../mail/filtertypes.xml.in.h:66
 msgid "Set Label"
 msgstr "Estabelecer a etiqueta"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:67
 msgid "Assign Color"
 msgstr "Asignar unha cor"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Unset Color"
 msgstr "Quitar cor"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Assign Score"
 msgstr "Asignar unha puntuación"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Adjust Score"
 msgstr "Axustar a puntuación"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Set Status"
 msgstr "Estabelecer o estado"
 
-#: ../mail/filtertypes.xml.in.h:71 ../mail/searchtypes.xml.in.h:37
+#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:37
 #: ../mail/vfoldertypes.xml.in.h:37
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: ../mail/filtertypes.xml.in.h:72
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Unset Status"
 msgstr "Desfacer a definición de estado"
 
-#: ../mail/filtertypes.xml.in.h:73
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Beep"
 msgstr "Son de aviso"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:75
 msgid "Play Sound"
 msgstr "Reproducir un son"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Run Program"
 msgstr "Executar o programa"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Forward to"
 msgstr "Reencamiñar a"
 
@@ -14597,85 +16574,94 @@ msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Codificar nomes de ficheiro á forma de _Outlook/GMail\""
 
 #: ../mail/mail-config.ui.h:12
+#, fuzzy
+msgid "Send messages through Outbo_x folder"
+msgstr "Gardando a mensaxe no cartafol de saída."
+
+#: ../mail/mail-config.ui.h:13
+msgid "Number of characters for word w_rapping:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:14
 msgid "Ch_aracter encoding:"
 msgstr "Codificación de car_acteres:"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:15
 msgid "Replies and Forwards"
 msgstr "Respostas e reencamiñamentos"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:16
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "_Forward style:"
 msgstr "Estilo do _reencamiñamento:"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "Start _typing at the bottom on replying"
 msgstr "Comezar a escribir ao final da respos_ta"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 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:18
+#: ../mail/mail-config.ui.h:20
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Ig_norar «Responder a:» para as listas de correo"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 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:20
+#: ../mail/mail-config.ui.h:22
 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:21
+#: ../mail/mail-config.ui.h:23
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Anexo"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "En liña (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Non citar"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "En liña"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "Sig_natures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 msgid "_Languages"
 msgstr "I_diomas"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:32
 msgid "Languages Table"
 msgstr "Táboa de idiomas"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:33
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14683,23 +16669,10 @@ msgstr ""
 "Esta lista de idiomas mostra unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 msgid "Check spelling while I _type"
 msgstr "Comprobar a ortografía men_tres escribe"
 
-#: ../mail/mail-config.ui.h:34
-msgid "Color for _misspelled words:"
-msgstr "Cor para as palabras escritas incorrecta_mente:"
-
-#: ../mail/mail-config.ui.h:35
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "Seleccionar unha cor"
-
-#: ../mail/mail-config.ui.h:36
-msgid "Spell Checking"
-msgstr "Comprobación ortográfica"
-
 #: ../mail/mail-config.ui.h:37
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
@@ -14741,38 +16714,44 @@ msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Enviar unha mensaxe con _destinatarios non inseridos como enderezos de correo"
 
-#: ../mail/mail-config.ui.h:50
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:51
+#, fuzzy
+msgid "Sending a message using _key accelerator (Ctrl+Enter)"
+msgstr "Enviar unha m_ensaxe co asunto baleiro"
+
+#: ../mail/mail-config.ui.h:52
 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:54
+#: ../mail/mail-config.ui.h:56
 msgid "Use for Folders"
 msgstr "Usar para os cartafoles"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:57
 msgid "A_dd"
 msgstr "Enga_dir"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:59
 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:59
+#: ../mail/mail-config.ui.h:61
 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:61 ../modules/mail/em-composer-prefs.c:870
+#: ../mail/mail-config.ui.h:63 ../modules/mail/em-composer-prefs.c:836
 msgid "Account"
 msgstr "Conta"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:64
 msgid "Send account overrides"
 msgstr "Enviar sobrescritura de conta"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:65
 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 "
@@ -14784,190 +16763,198 @@ 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:64
+#: ../mail/mail-config.ui.h:66
 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:65
+#: ../mail/mail-config.ui.h:67
 msgid "Send Account"
 msgstr "Conta de envío"
 
-#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:73 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:75
 msgid "Start up"
 msgstr "Iniciar"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:76
 msgid "Check for new _messages on start"
 msgstr "Comprobar se hai _mensaxes novas ao iniciar"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:77
 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:76
+#: ../mail/mail-config.ui.h:78
 msgid "Message Display"
 msgstr "Vista das mensaxes"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:79
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "S_tandard Font:"
 msgstr "Tipo de letra es_tándar:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Select HTML fixed width font"
 msgstr "Seleccionar o tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Select HTML variable width font"
 msgstr "Seleccionar o tipo de letra de largura variábel para HTML"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "Fix_ed Width Font:"
 msgstr "Tipo de l_etra de largura fixa:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como lidas despois de"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:86
 msgid "Highlight _quotations with"
 msgstr "Realzar as _citas con"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:87
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Pick a color"
+msgstr "Seleccionar unha cor"
+
+#: ../mail/mail-config.ui.h:88
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Default character e_ncoding:"
 msgstr "Codificació_n de caracteres predeterminada:"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 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:88
+#: ../mail/mail-config.ui.h:91
 msgid "F_all back to threading messages by subject"
 msgstr "Volver agrupar as mensaxes polo _asunto"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "Delete Mail"
 msgstr "Eliminar o correo"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "Empty _trash folders"
 msgstr "Baleirar os cartafoles do _lixo"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:94
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar antes de e_xpurgar un cartafol"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "_Show animated images"
 msgstr "Mo_strar as imaxes animadas"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 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:95
+#: ../mail/mail-config.ui.h:98
 msgid "Loading Images"
 msgstr "Cargando as imaxes"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "_Never load images from the Internet"
 msgstr "_Non cargar nunca as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "_Load images only in messages from contacts"
 msgstr "Ca_rgar as imaxes só nas mensaxes dos contactos"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:101
 msgid "_Always load images from the Internet"
 msgstr "C_argar sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:103 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "Fotografía do remitente"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:105
 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:103
+#: ../mail/mail-config.ui.h:106
+msgid "Search gra_vatar.com for the photograph of sender"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:107
 msgid "Displayed Message Headers"
 msgstr "Mostrar as cabeceiras da mensaxe"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:108
 msgid "Mail Headers Table"
 msgstr "Táboa de cabeceiras de correo"
 
-#: ../mail/mail-config.ui.h:105
-#: ../modules/addressbook/autocompletion-config.c:116
+#: ../mail/mail-config.ui.h:109
+#: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Formato da data e da hora"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:111
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar as _mensaxes entrantes para detectar correo lixo"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:112
 msgid "_Delete junk messages"
 msgstr "_Eliminar o correo lixo"
 
-#: ../mail/mail-config.ui.h:109
-msgid "Check cu_stom headers for junk"
-msgstr "Comprobar as cabeceiras personalizada_s para detectar correo lixo"
+#: ../mail/mail-config.ui.h:113
+#, fuzzy
+msgid "Just Test Options"
+msgstr "Opcións de personali_zación"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:114
 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:111
+#: ../mail/mail-config.ui.h:115
 msgid "_Lookup in local address book only"
 msgstr "Buscar só nas axendas de enderezos _locais"
 
-#: ../mail/mail-config.ui.h:112
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
-"Ignorarase a opción se se atopa algunha coincidencia para as cabeceiras "
-"personalizadas do correo lixo."
+#: ../mail/mail-config.ui.h:116
+msgid "Check cu_stom headers for junk"
+msgstr "Comprobar as cabeceiras personalizada_s para detectar correo lixo"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:118
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "Sen cifrado"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:119
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:120
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
@@ -15256,7 +17243,7 @@ msgstr ""
 "eliminadas de todos os cartafoles?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
@@ -15544,10 +17531,6 @@ msgstr ""
 "Pode escoller entre ignorar este cartafol, sobrescribilo, anexar os seus "
 "contidos ou saír."
 
-#: ../mail/mail.error.xml.h:109
-msgid "Ignore"
-msgstr "Ignorar"
-
 #: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "S_obrescribir"
@@ -15746,6 +17729,11 @@ 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
+#, fuzzy
+msgid "Failed to connect account &quot;{0}&quot;."
+msgstr "Produciuse un erro ao desconectar a conta &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Produciuse un erro ao desconectar a conta &quot;{0}&quot;."
 
@@ -15765,36 +17753,36 @@ msgstr "{0}"
 msgid "Failed to open folder."
 msgstr "Produciuse un erro ao abrir o cartafol."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to find duplicate messages."
 msgstr "Produciuse un erro ao buscar as mensaxes duplicadas."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to retrieve messages."
 msgstr "Produciuse un erro ao obter as mensaxes."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to mark messages as read."
 msgstr "Produciuse un erro ao marcar as mensaxes como lidas."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to remove attachments from messages."
 msgstr "Produciuse un erro ao retirar os anexos das mensaxes."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:166
 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:166
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to save messages to disk."
 msgstr "Produciuse un erro ao gardar as mensaxes ao disco."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:168
 msgid "Hidden file is attached."
 msgstr "Existe un ficheiro oculto adxunto."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:169
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -15802,51 +17790,66 @@ 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:169
+#: ../mail/mail.error.xml.h:170
 msgid "Printing failed."
 msgstr "Produciuse un fallo ao imprimir."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:171
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "A impresora respondeu &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:172
 msgid "Could not perform this operation on {0}."
 msgstr "Non é posíbel realizar esta operación en {0}."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:173
 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:173
+#: ../mail/mail.error.xml.h:174
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Mensaxe desde a conta &quot;{0}&quot;:"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Cancelando…"
 
-#: ../mail/mail-send-recv.c:526
+#: ../mail/mail-send-recv.c:631
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir o correo"
 
-#: ../mail/mail-send-recv.c:542
+#: ../mail/mail-send-recv.c:645
 msgid "Cancel _All"
 msgstr "Cancel_ar todo"
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1248
 msgid "Updating..."
 msgstr "Actualizando…"
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
 msgid "Waiting..."
 msgstr "Agardando…"
 
-#: ../mail/mail-send-recv.c:997
+#: ../mail/mail-send-recv.c:1220
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Comprobando se hai correo novo en «%s»"
 
+#: ../mail/mail-send-recv.c:1421
+#, c-format
+msgid "Deleting junk and expunging trash at '%s'"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:1423
+#, fuzzy, c-format
+msgid "Deleting junk at '%s'"
+msgstr "Conectando novamente con %s"
+
+#: ../mail/mail-send-recv.c:1425
+#, fuzzy, c-format
+msgid "Expunging trash at '%s'"
+msgstr "Baleirando o lixo de «%s»"
+
 #: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
@@ -15899,49 +17902,49 @@ msgstr "Superior"
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5749
+#: ../mail/message-list.c:455 ../mail/message-list.c:5798
 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:1860 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:1885 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1869
+#: ../mail/message-list.c:1894
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
 # (pofilter) variables: do not translate: %a, %l, %p
-#: ../mail/message-list.c:1881
+#: ../mail/message-list.c:1906
 msgid "%a %l:%M %p"
 msgstr "O %a ás %l:%M %p"
 
 # (pofilter) variables: do not translate: %b, %l, %p
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:1914
 msgid "%b %d %l:%M %p"
 msgstr "O %b %d ás %l:%M %p"
 
 # (pofilter) variables: do not translate: %b
-#: ../mail/message-list.c:1891
+#: ../mail/message-list.c:1916
 msgid "%b %d %Y"
 msgstr "O %b %d de %Y"
 
-#: ../mail/message-list.c:2771
+#: ../mail/message-list.c:2796
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensaxes visíbeis"
 
-#: ../mail/message-list.c:3399 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3440 ../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:4706
+#: ../mail/message-list.c:4747
 msgid "Follow-up"
 msgstr "Seguimento"
 
-#: ../mail/message-list.c:5687
+#: ../mail/message-list.c:5735
 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 "
@@ -15953,7 +17956,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:5695
+#: ../mail/message-list.c:5743
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes neste cartafol."
 
@@ -15994,53 +17997,49 @@ msgid "Subject or Addresses contains"
 msgstr "O asunto ou os enderezos conteñen"
 
 #: ../mail/searchtypes.xml.in.h:55
-#: ../modules/mail/e-mail-shell-view-actions.c:2002
+#: ../modules/mail/e-mail-shell-view-actions.c:2095
 msgid "Recipients contain"
 msgstr "Os destinatarios conteñen"
 
 #: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:1995
+#: ../modules/mail/e-mail-shell-view-actions.c:2088
 msgid "Message contains"
 msgstr "A mensaxe contén"
 
 #: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2016
+#: ../modules/mail/e-mail-shell-view-actions.c:2109
 msgid "Subject contains"
 msgstr "O asunto contén"
 
 #: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2009
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "Sender contains"
 msgstr "O remitente contén"
 
 #: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../modules/mail/e-mail-shell-view-actions.c:2081
 msgid "Body contains"
 msgstr "O corpo contén"
 
-#: ../mail/vfoldertypes.xml.in.h:54
-msgid "Message Location"
-msgstr "Localización da mensaxe"
-
 #. 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:122
-#: ../modules/mail/em-mailer-prefs.c:1212
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1222
 msgid "_Table column:"
 msgstr "Columna da _táboa:"
 
-#: ../modules/addressbook/autocompletion-config.c:125
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "Formatado de enderezos"
 
-#: ../modules/addressbook/autocompletion-config.c:128
+#: ../modules/addressbook/autocompletion-config.c:129
 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:136
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "Completado automático"
 
-#: ../modules/addressbook/autocompletion-config.c:139
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "Mo_strar sempre o enderezo do contacto completado automaticamente"
 
@@ -16075,7 +18074,7 @@ msgid "_Contact"
 msgstr "_Contacto"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1081
 msgid "Create a new contact"
 msgstr "Crear un contacto novo"
 
@@ -16085,7 +18084,7 @@ msgid "Contact _List"
 msgstr "_Lista de contactos"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:985
+#: ../modules/addressbook/e-book-shell-view-actions.c:1088
 msgid "Create a new contact list"
 msgstr "Crear unha lista de contactos nova"
 
@@ -16095,7 +18094,7 @@ msgid "Address _Book"
 msgstr "_Axenda de enderezos"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/addressbook/e-book-shell-view-actions.c:1004
 msgid "Create a new address book"
 msgstr "Crear unha axenda de enderezos nova"
 
@@ -16108,242 +18107,242 @@ msgid "Address Book Properties"
 msgstr "Propiedades da axenda de enderezos"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:475
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:578
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
 msgid "Save as vCard"
 msgstr "Gardar como vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Co_py All Contacts To..."
 msgstr "Co_piar todos os contactos a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:983
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copiar os contactos da axenda de enderezos seleccionada a outra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "D_elete Address Book"
 msgstr "_Eliminar a axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Delete the selected address book"
 msgstr "Eliminar a axenda seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver todos os contactos a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
 msgid "Move the contacts of the selected address book to another"
 msgstr "Mover os contactos da axenda de enderezos seleccionada a outra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Address _Book Properties"
 msgstr "Propiedades da a_xenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:1011
 msgid "Show properties of the selected address book"
 msgstr "Mostrar as propiedades da axenda de enderezos seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../modules/calendar/e-cal-shell-view-actions.c:1254
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
 msgid "Refresh the selected address book"
 msgstr "Actualizar o caderno de enderezos seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Address Book _Map"
 msgstr "_Mapa do caderno de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
 msgid "Show map with all contacts from selected address book"
 msgstr ""
 "Mostrar o mapa con tódolos contactos do caderno de enderezos seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
-#: ../modules/calendar/e-task-shell-view-actions.c:766
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../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:1703
 msgid "_Rename..."
 msgstr "_Renomear…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:1032
 msgid "Rename the selected address book"
 msgstr "Renomear a axenda de enderezos seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-view-actions.c:1039
 msgid "Stop loading"
 msgstr "Deter a carga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "_Copy Contact To..."
 msgstr "_Copiar o contacto a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-view-actions.c:1046
 msgid "Copy selected contacts to another address book"
 msgstr "Copiar os contactos seleccionados a outra axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
 msgid "_Delete Contact"
 msgstr "E_liminar o contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
 msgid "_Find in Contact..."
 msgstr "_Buscar no contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:1060
 msgid "Search for text in the displayed contact"
 msgstr "Buscar un texto no contacto mostrado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:1065
 msgid "_Forward Contact..."
 msgstr "_Reencamiñar o contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
 msgid "Send selected contacts to another person"
 msgstr "Enviar os contactos seleccionados a outra persoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:969
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "_Move Contact To..."
 msgstr "_Mover o contacto a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
+#: ../modules/addressbook/e-book-shell-view-actions.c:1074
 msgid "Move selected contacts to another address book"
 msgstr "Mover os contactos seleccionados a outra axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "_New Contact..."
 msgstr "Contacto _novo…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:1086
 msgid "New Contact _List..."
 msgstr "_Lista de contactos nova…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1093
 msgid "_Open Contact"
 msgstr "Abrir _o contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:992
+#: ../modules/addressbook/e-book-shell-view-actions.c:1095
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:1100
 msgid "_Send Message to Contact..."
 msgstr "_Enviar unha mensaxe ao contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../modules/addressbook/e-book-shell-view-actions.c:1102
 msgid "Send a message to the selected contacts"
 msgstr "Enviar unha mensaxe aos contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1006
-#: ../modules/calendar/e-cal-shell-view-actions.c:1576
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/addressbook/e-book-shell-view-actions.c:1109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Actions"
 msgstr "_Accións"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1013
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
-#: ../modules/calendar/e-task-shell-view-actions.c:831
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../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:1868
 msgid "_Preview"
 msgstr "Vista _previa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../modules/addressbook/e-book-shell-view-actions.c:1137
 msgid "Address Book Map"
 msgstr "Mapa do caderno de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1169
 msgid "Contact _Preview"
 msgstr "Vista _previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1068
+#: ../modules/addressbook/e-book-shell-view-actions.c:1171
 msgid "Show contact preview window"
 msgstr "Mostrar a xanela de vista previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1177
 msgid "Show _Maps"
 msgstr "Mostrar _mapas"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1076
+#: ../modules/addressbook/e-book-shell-view-actions.c:1179
 msgid "Show maps in contact preview window"
 msgstr "Mostrar mapas na xanela de vista previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1095
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
-#: ../modules/calendar/e-task-shell-view-actions.c:913
-#: ../modules/mail/e-mail-shell-view-actions.c:1905
+#: ../modules/addressbook/e-book-shell-view-actions.c:1198
+#: ../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:1998
 msgid "_Classic View"
 msgstr "Vista _clásica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
 msgid "Show contact preview below the contact list"
 msgstr "Mostrar a vista previa do contacto embaixo da lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1102
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
-#: ../modules/calendar/e-task-shell-view-actions.c:920
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../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:2005
 msgid "_Vertical View"
 msgstr "Vista _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Show contact preview alongside the contact list"
 msgstr "Mostrar a vista previa do contacto ao carón da lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
-#: ../modules/calendar/e-task-shell-view-actions.c:972
+#: ../modules/addressbook/e-book-shell-view-actions.c:1222
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Unmatched"
 msgstr "Sen coincidencias"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1129
-#: ../modules/calendar/e-cal-shell-view-actions.c:1763
-#: ../modules/calendar/e-memo-shell-view-actions.c:783
-#: ../modules/calendar/e-task-shell-view-actions.c:982
-#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1232
+#: ../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:2074
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1162
+#: ../modules/addressbook/e-book-shell-view-actions.c:1265
 msgid "Print all shown contacts"
 msgstr "Imprimir os contactos mostrados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1272
 msgid "Preview the contacts to be printed"
 msgstr "Previsualizar os contactos que se van imprimir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1176
+#: ../modules/addressbook/e-book-shell-view-actions.c:1279
 msgid "Print selected contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1191
+#: ../modules/addressbook/e-book-shell-view-actions.c:1294
 msgid "S_ave Address Book as vCard"
 msgstr "G_ardar a axenda de enderezos como VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1193
+#: ../modules/addressbook/e-book-shell-view-actions.c:1296
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr ""
 "Gardar os contactos da axenda de enderezos seleccionada como unha VCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1199
-#: ../modules/addressbook/e-book-shell-view-actions.c:1209
+#: ../modules/addressbook/e-book-shell-view-actions.c:1302
+#: ../modules/addressbook/e-book-shell-view-actions.c:1312
 msgid "_Save as vCard..."
 msgstr "_Gardar como vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1201
+#: ../modules/addressbook/e-book-shell-view-actions.c:1304
 msgid "Save selected contacts as a vCard"
 msgstr "Gardar os contactos seleccionados como unha VCard"
 
@@ -16367,7 +18366,7 @@ msgstr "Enviar unha _mensaxe á lista"
 msgid "_Send Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -16377,17 +18376,17 @@ msgstr ""
 "\n"
 "Isto restabelecerá todas as configuracións persoais, filtros de correo, etc."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "_Restabelecer desde un ficheiro de respaldo:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "Seleccionar un ficheiro de respaldo a restaurar"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "Restaurar desde un respaldo"
@@ -16426,106 +18425,106 @@ msgstr "R_estabelecer os datos do Evolution…"
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Restabelecer os datos e os axustes do Evolution desde un ficheiro"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:75
 msgid "Back up Evolution directory"
 msgstr "Facer unha copia de seguranza do directorio do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:77
 msgid "Restore Evolution directory"
 msgstr "Restabelecer o directorio do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:79
 msgid "Check Evolution Back up"
 msgstr "Comprobar a copia de seguranza do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Restart Evolution"
 msgstr "Reiniciar o Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "With Graphical User Interface"
 msgstr "Con interface gráfica de usuario"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:321
-#: ../modules/backup-restore/evolution-backup-tool.c:515
+#: ../modules/backup-restore/evolution-backup-tool.c:281
+#: ../modules/backup-restore/evolution-backup-tool.c:475
 msgid "Shutting down Evolution"
 msgstr "Pechando o Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:290
 msgid "Backing Evolution accounts and settings"
 msgstr "Facendo unha copia de seguranza das contas e axustes do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:347
+#: ../modules/backup-restore/evolution-backup-tool.c:307
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Facendo unha copia de seguranza dos datos do Evolution (correos, contactos, "
 "calendarios, tarefas e notas)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:363
+#: ../modules/backup-restore/evolution-backup-tool.c:323
 msgid "Back up complete"
 msgstr "Copia de seguranza completada"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:370
-#: ../modules/backup-restore/evolution-backup-tool.c:702
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:662
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:521
+#: ../modules/backup-restore/evolution-backup-tool.c:481
 msgid "Back up current Evolution data"
 msgstr "Facer unha copia de seguranza dos datos actuais do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:528
+#: ../modules/backup-restore/evolution-backup-tool.c:488
 msgid "Extracting files from back up"
 msgstr "Extraendo os ficheiros desde a copia de seguranza"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:610
+#: ../modules/backup-restore/evolution-backup-tool.c:570
 msgid "Loading Evolution settings"
 msgstr "Cargando os axustes do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:676
+#: ../modules/backup-restore/evolution-backup-tool.c:636
 msgid "Removing temporary back up files"
 msgstr "Retirando os ficheiros temporais da copia de seguranza"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:687
+#: ../modules/backup-restore/evolution-backup-tool.c:647
 msgid "Reloading registry service"
 msgstr "Recargando o servizo de rexistro"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:850
 msgid "Evolution Back Up"
 msgstr "Respaldo de Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:917
+#: ../modules/backup-restore/evolution-backup-tool.c:851
 #, 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:921
+#: ../modules/backup-restore/evolution-backup-tool.c:855
 msgid "Evolution Restore"
 msgstr "Restabelecemento do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:922
+#: ../modules/backup-restore/evolution-backup-tool.c:856
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restabelecendo desde o cartafol %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:991
+#: ../modules/backup-restore/evolution-backup-tool.c:925
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:992
+#: ../modules/backup-restore/evolution-backup-tool.c:926
 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:994
+#: ../modules/backup-restore/evolution-backup-tool.c:928
 msgid "Restoring Evolution Data"
 msgstr "Restabelecendo os datos do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:995
+#: ../modules/backup-restore/evolution-backup-tool.c:929
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Agarde mentres o Evolution restabelece os datos."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1017
+#: ../modules/backup-restore/evolution-backup-tool.c:951
 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."
@@ -16608,70 +18607,76 @@ msgid "Convert message text to _Unicode"
 msgstr "Converter o texto da mensaxe a _Unicode"
 
 #: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#, fuzzy
+msgid "Junk filter using Bogofilter"
+msgstr "Software de filtrado de SPAM:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
 msgid "Standard LDAP Port"
 msgstr "Porto LDAP estándar"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP sobre SSL (obsoleto)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
 msgid "Microsoft Global Catalog"
 msgstr "Catálogo global de Microsoft"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
 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:569
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
 msgid "Connecting to LDAP"
 msgstr "Conecando a LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
 msgid "Server Information"
 msgstr "Información do servidor"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (recomendado)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 msgid "Encryption:"
 msgstr "Cifrado:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
 msgid "Anonymous"
 msgstr "Anonimamente"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "Usando enderezo de correo"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
 msgstr "Empregar o nome distintivo (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Method:"
 msgstr "Método:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -16682,36 +18687,36 @@ msgstr ""
 "anónimo ao servidor LDAP."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
 msgid "Using LDAP"
 msgstr "Usando LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
 #: ../modules/mail/e-mail-shell-view.c:115
 msgid "Searching"
 msgstr "Buscando"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
 msgid "Search Base:"
 msgstr "Base de busca:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
 msgid "Find Possible Search Bases"
 msgstr "Buscar bases de busca posíbeis"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
 msgid "One Level"
 msgstr "Un nivel"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
 msgid "Subtree"
 msgstr "Subárbore"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Search Scope:"
 msgstr "Ámbito da busca:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 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 "
@@ -16724,23 +18729,23 @@ 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:787
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
 msgid "Search Filter:"
 msgstr "Filtro de busca:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
 msgid "Limit:"
 msgstr "Límite:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
 msgid "contacts"
 msgstr "contactos"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "Browse until limit is reached"
 msgstr "Examinar até chegar ao final"
 
@@ -16754,41 +18759,41 @@ 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:441
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:413
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "Erro HTTP: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
 msgid "Could not parse response"
 msgstr "Non foi posíbel analizar a resposta"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:450
 msgid "Empty response"
 msgstr "Resposta baleira"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:458
 msgid "Unexpected reply from server"
 msgstr "Resposta non agardada do servidor"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1065
 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:1342
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1291
 msgid "Path"
 msgstr "Ruta"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:262
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:198
 msgid "Choose a Calendar"
 msgstr "Elixir un calendario"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:265
 msgid "Choose a Memo List"
 msgstr "Elixir unha lista de notas"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:268
 msgid "Choose a Task List"
 msgstr "Elixir unha lista de tarefas"
 
@@ -16816,11 +18821,11 @@ msgstr "O servidor xestiona os convites a reunións"
 msgid "Choose which address books to use."
 msgstr "Seleccione a axenda de enderezos a usar."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Usar no cartafol Cumpreanos e aniversarios"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:126
+#: ../modules/cal-config-google/e-google-chooser-button.c:125
 msgid "Default User Calendar"
 msgstr "Calendario do usuario por omisión"
 
@@ -16867,13 +18872,15 @@ 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)"
+#, fuzzy
+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)"
+#, fuzzy
+msgid "Centigrade (ےC)"
 msgstr "Centigraos (°C)"
 
 #. Translators: This is the temperature in kelvin.
@@ -16885,27 +18892,110 @@ msgstr "Kelvin (K)"
 msgid "Units:"
 msgstr "Unidades:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:319
+#: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "I_mportar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:405
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+#, fuzzy
+msgid "Importing an event"
+msgstr "Importando datos do Pine"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+#, fuzzy
+msgid "Importing a memo"
+msgstr "Importando a caixa de correo"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+#, fuzzy
+msgid "Importing a task"
+msgstr "Importando datos Elm"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "Seleccionar un calendario"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+#, fuzzy
+msgid "Select a Memo List"
+msgstr "_Eliminar a lista de notas"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
 msgstr "Seleccionar unha lista de tarefas"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "I_mportar ao calendario"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:449
-msgid "I_mport to Tasks"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+#, fuzzy
+msgid "I_mport to Memo List"
 msgstr "_Importar ás tarefas"
 
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+#, fuzzy
+msgid "I_mport to Task List"
+msgstr "_Importar ás tarefas"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:186
+#: ../modules/calendar/e-cal-shell-view-actions.c:162
+msgid "New Calendar"
+msgstr "Calendario novo"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:190
+#: ../modules/calendar/e-memo-shell-view-actions.c:164
+msgid "New Memo List"
+msgstr "Lista de notas nova"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:194
+#: ../modules/calendar/e-task-shell-view-actions.c:187
+msgid "New Task List"
+msgstr "Lista de tarefas nova"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "Moving an event into the calendar '%s'"
+msgstr "Movendo un evento no calendario %s"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+#, fuzzy, c-format
+msgid "Copying a memo into the memo list '%s'"
+msgstr "Copiando de recordatorio na lista de recordatorios «{0}»"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+#, fuzzy, c-format
+msgid "Moving a memo into the memo list '%s'"
+msgstr "Movendo un recordatorio na lista de recordatorios «{0}»?"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+#, fuzzy, c-format
+msgid "Copying a task into the task list '%s'"
+msgstr "Copiando unha tarefa na lista de tarefas «{0}»"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+#, fuzzy, c-format
+msgid "Moving a task into the task list '%s'"
+msgstr "Movendo unha tarefa na lista de tarefas «{0}»"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+msgid "Calendar Selector"
+msgstr "Selector de calendario"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+msgid "Memo List Selector"
+msgstr "Selector de lista de notas"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+msgid "Task List Selector"
+msgstr "Selector de lista de tarefas"
+
 #: ../modules/calendar/e-calendar-preferences.c:516
 msgid "Selected Calendars for Alarms"
 msgstr "Seleccionar calendario para alarmas"
@@ -16975,7 +19065,7 @@ msgid "_24 hour"
 msgstr "_24 horas"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Work Week"
 msgstr "Semana laboral"
 
@@ -17132,72 +19222,57 @@ msgstr ""
 msgid "Publishing Information"
 msgstr "Información de publicación"
 
-#: ../modules/calendar/e-cal-shell-backend.c:312
-#: ../modules/calendar/e-cal-shell-view-actions.c:190
-msgid "New Calendar"
-msgstr "Calendario novo"
-
-#: ../modules/calendar/e-cal-shell-backend.c:321
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: ../modules/calendar/e-cal-shell-backend.c:323
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Ci_ta para todo o día"
 
-#: ../modules/calendar/e-cal-shell-backend.c:330
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "Crear unha cita nova para todo o día"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "R_eunión"
 
-#: ../modules/calendar/e-cal-shell-backend.c:337
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr "Crear unha solicitude de nova xuntanza"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../modules/calendar/e-cal-shell-backend.c:347
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-backend.c:140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:702
+#: ../modules/calendar/e-cal-shell-backend.c:255
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "Abrindo o calendario «%s»"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
-msgid "Calendar Selector"
-msgstr "Selector de calendario"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:290
+#: ../modules/calendar/e-cal-shell-view-actions.c:267
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:296
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -17209,369 +19284,366 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:338
+#: ../modules/calendar/e-cal-shell-view-actions.c:313
 msgid "Purge events older than"
 msgstr "Purgar as actividades anteriores a"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:584
-msgid "Copying Items"
-msgstr "Copiando os elementos"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:877
-msgid "Moving Items"
-msgstr "Movendo os elementos"
+#: ../modules/calendar/e-cal-shell-view-actions.c:895
+#, fuzzy
+msgid "Making an occurrence movable"
+msgstr "Facer esta aparición _desprazábel"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1210
+#: ../modules/calendar/e-cal-shell-view-actions.c:1055
 msgid "event"
 msgstr "actividade"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-memopad.c:230
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:526
-#: ../modules/calendar/e-task-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-actions.c:1057
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:469
+#: ../modules/calendar/e-task-shell-view-actions.c:587
 msgid "Save as iCalendar"
 msgstr "Gardar como iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1191
+#: ../modules/calendar/e-memo-shell-view-actions.c:550
+#: ../modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Copy..."
 msgstr "_Copiar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 msgid "D_elete Calendar"
 msgstr "_Eliminar o calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Delete the selected calendar"
 msgstr "Eliminar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
 msgid "Go Back"
 msgstr "Atrás"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 msgid "Go Forward"
 msgstr "Adiante"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
 msgid "Select today"
 msgstr "Seleccionar o día de hoxe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
 msgid "Select _Date"
 msgstr "Seleccionar unha _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
 msgid "Select a specific date"
 msgstr "Seleccionar unha data determinada"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
 msgid "_New Calendar"
 msgstr "Calendario _novo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-cal-shell-view-actions.c:1247
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Purg_e"
 msgstr "P_urgar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Purge old appointments and meetings"
 msgstr "Purgar as citas e reunións antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Refresh the selected calendar"
 msgstr "Actualizar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Rename the selected calendar"
 msgstr "Renomear o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Find _Next"
 msgstr "Buscar _seguinte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
 msgid "Find next occurrence of the current search string"
 msgstr "Buscar a seguinte coincidencia da frase de busca actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "Find _Previous"
 msgstr "Buscar _anterior"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "Find previous occurrence of the current search string"
 msgstr "Buscar a coincidencia anterior da frase de busca actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 msgid "Stop _Running Search"
 msgstr "Dete_r a busca en curso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "Stop currently running search"
 msgstr "Deter a busca actual en execución"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Show _Only This Calendar"
 msgstr "M_ostrar só este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar ao calendario…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "_Delegate Meeting..."
 msgstr "_Delegar a reunión…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "_Delete Appointment"
 msgstr "_Eliminar esta cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Delete selected appointments"
 msgstr "Eliminar as citas seleccionadas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Delete This _Occurrence"
 msgstr "Eliminar esta _aparición"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Delete this occurrence"
 msgstr "Eliminar esta aparición"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Delete All Occ_urrences"
 msgstr "Eliminar _todas as aparicións"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Delete all occurrences"
 msgstr "Eliminar todas as aparicións"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "New All Day _Event..."
 msgstr "Nova _actividade de día completo…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1492
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new all day event"
 msgstr "Crear unha actividade nova de día completo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-cal-shell-view-memopad.c:242
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-memo-shell-view-actions.c:543
+#: ../modules/calendar/e-task-shell-view-actions.c:668
 msgid "_Forward as iCalendar..."
 msgstr "Reemcamiña_r como iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "New _Meeting..."
 msgstr "_Reunión nova…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Create a new meeting"
 msgstr "Crear unha reunión nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "New _Appointment..."
 msgstr "Cit_a nova…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta aparición _desprazábel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Open Appointment"
 msgstr "_Abrir unha cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "View the current appointment"
 msgstr "Ver a cita actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_Schedule Meeting..."
 msgstr "_Programar unha reunión…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Converts an appointment to a meeting"
 msgstr "Converte una cita nunha reunión"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_erter en cita…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Converts a meeting to an appointment"
 msgstr "Converte unha reunión nunha cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Quit"
 msgstr "Saír"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
 msgid "Day"
 msgstr "Día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Show one day"
 msgstr "Mostrar un día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-cal-shell-view-actions.c:1537
 msgid "Show as list"
 msgstr "Mostrar como unha lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1544
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show one work week"
 msgstr "Mostrar unha semana laboral"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1739
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos próximos sete días"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Occurs Less Than 5 Times"
 msgstr "Acontece menos de 5 veces"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1777
-#: ../modules/calendar/e-memo-shell-view-actions.c:797
-#: ../modules/calendar/e-task-shell-view-actions.c:996
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1784
-#: ../modules/calendar/e-memo-shell-view-actions.c:804
-#: ../modules/calendar/e-task-shell-view-actions.c:1003
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1794
-#: ../modules/calendar/e-cal-shell-view-actions.c:1808
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#: ../modules/calendar/e-cal-shell-view-actions.c:1635
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Print..."
 msgstr "Imprimir…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Preview the calendar to be printed"
 msgstr "Previsualizar o calendario que se vai imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1825
-#: ../modules/calendar/e-cal-shell-view-memopad.c:305
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "_Save as iCalendar..."
 msgstr "Gardar como iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Go To"
 msgstr "Ir a"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:228
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-cal-shell-view-memopad.c:206
+#: ../modules/calendar/e-memo-shell-view-actions.c:467
 msgid "memo"
 msgstr "nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:249
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "New _Memo"
 msgstr "Nota _nova"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-memo-shell-backend.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo"
 msgstr "Crear unha nota nova"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:256
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Open Memo"
 msgstr "_Abrir a nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:280
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "View the selected memo"
 msgstr "Ver a nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:285
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Open _Web Page"
 msgstr "Abrir a páxina _web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Print the selected memo"
 msgstr "Imprimir a nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1561
+#: ../modules/calendar/e-cal-shell-view-private.c:808
 msgid "Searching next matching event"
 msgstr "Buscando o seguinte evento coincidente"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../modules/calendar/e-cal-shell-view-private.c:809
 msgid "Searching previous matching event"
 msgstr "Buscando o anterior evento coincidente"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1583
+#: ../modules/calendar/e-cal-shell-view-private.c:830
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Non é posíbel atopar un evento coincidente dentro de %d ano"
 msgstr[1] "Non é posíbel atopar un evento coincidente dentro de %d anos"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1587
+#: ../modules/calendar/e-cal-shell-view-private.c:834
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Non é posíbel atopar un evento coincidente fai %d ano"
 msgstr[1] "Non é posíbel atopar un evento coincidente fai %d anos"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1612
+#: ../modules/calendar/e-cal-shell-view-private.c:857
 msgid "Cannot search with no active calendar"
 msgstr "Non é posíbel buscar sen un calendario activo"
 
@@ -17579,237 +19651,209 @@ msgstr "Non é posíbel buscar sen un calendario activo"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid "task"
 msgstr "tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
+#: ../modules/calendar/e-task-shell-view-actions.c:647
 msgid "_Assign Task"
 msgstr "_Asignar unha tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "Mark selected tasks as complete"
 msgstr "Marcar as tarefas seleccionadas como terminadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "Mark selected tasks as incomplete"
 msgstr "Marcar as tarefas seleccionadas como non terminadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "New _Task"
 msgstr "_Tarefa nova"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../modules/calendar/e-task-shell-backend.c:215
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-backend.c:64
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task"
 msgstr "Crear unha tarefa nova"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Open Task"
 msgstr "_Abrir unha tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "View the selected task"
 msgstr "Ver a tarefa seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Print the selected task"
 msgstr "Imprimir a tarefa seleccionada"
 
-#: ../modules/calendar/e-memo-shell-backend.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-msgid "New Memo List"
-msgstr "Lista de notas nova"
-
-#: ../modules/calendar/e-memo-shell-backend.c:216
+#: ../modules/calendar/e-memo-shell-backend.c:63
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_ota"
 
-#: ../modules/calendar/e-memo-shell-backend.c:223
+#: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Nota _compartida"
 
-#: ../modules/calendar/e-memo-shell-backend.c:225
+#: ../modules/calendar/e-memo-shell-backend.c:72
 msgid "Create a new shared memo"
 msgstr "Crear unha nota compartida nova"
 
-#: ../modules/calendar/e-memo-shell-backend.c:233
+#: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Li_sta de notas"
 
-#: ../modules/calendar/e-memo-shell-backend.c:235
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Create a new memo list"
 msgstr "Crear unha lista de notas nova"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "Abrindo a lista de notas «%s»"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
-msgid "Memo List Selector"
-msgstr "Selector de lista de notas"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "Print Memos"
 msgstr "Imprimir as notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:236
 msgid "Memo List Properties"
 msgstr "Propiedades da lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../modules/calendar/e-memo-shell-view-actions.c:529
 msgid "_Delete Memo"
 msgstr "E_liminar a nota"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:536
 msgid "_Find in Memo..."
 msgstr "_Buscar na nota…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../modules/calendar/e-memo-shell-view-actions.c:538
 msgid "Search for text in the displayed memo"
 msgstr "Buscar un texto na nota mostrada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:557
 msgid "D_elete Memo List"
 msgstr "_Eliminar a lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:559
 msgid "Delete the selected memo list"
 msgstr "Eliminar a lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_New Memo List"
 msgstr "Lista de notas _nova"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Refresh the selected memo list"
 msgstr "Actualizar a lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Rename the selected memo list"
 msgstr "Renomear a lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "Show _Only This Memo List"
 msgstr "M_ostrar só esta lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Memo _Preview"
 msgstr "Vista _previa de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
 msgid "Show memo preview pane"
 msgstr "Mostrar o panel de vista previa de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
 msgid "Show memo preview below the memo list"
 msgstr "Mostrar a vista previa da nota embaxio da lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
 msgid "Show memo preview alongside the memo list"
 msgstr "Mostrar a vista previa da nota a carón da lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:816
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Print the list of memos"
 msgstr "Imprimir a lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
 msgid "Preview the list of memos to be printed"
 msgstr "Previsualizar a lista de notas para imprimir"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:210
 msgid "Delete Memos"
 msgstr "Eliminar as notas"
 
-#: ../modules/calendar/e-memo-shell-view.c:240
+#: ../modules/calendar/e-memo-shell-view.c:212
 msgid "Delete Memo"
 msgstr "Eliminar a nota"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:537
+#: ../modules/calendar/e-memo-shell-view-private.c:369
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:541
-#: ../modules/calendar/e-task-shell-view-private.c:747
+#: ../modules/calendar/e-memo-shell-view-private.c:373
+#: ../modules/calendar/e-task-shell-view-private.c:539
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionada"
 
-#: ../modules/calendar/e-task-shell-backend.c:204
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-msgid "New Task List"
-msgstr "Lista de tarefas nova"
-
-#: ../modules/calendar/e-task-shell-backend.c:213
+#: ../modules/calendar/e-task-shell-backend.c:62
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../modules/calendar/e-task-shell-backend.c:220
+#: ../modules/calendar/e-task-shell-backend.c:69
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa asigna_da"
 
-#: ../modules/calendar/e-task-shell-backend.c:222
+#: ../modules/calendar/e-task-shell-backend.c:71
 msgid "Create a new assigned task"
 msgstr "Crear unha tarefa asignada nova"
 
-#: ../modules/calendar/e-task-shell-backend.c:230
+#: ../modules/calendar/e-task-shell-backend.c:79
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Lista de tare_fas"
 
-#: ../modules/calendar/e-task-shell-backend.c:232
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-backend.c:81
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "Create a new task list"
 msgstr "Crear unha lista de tarefas nova"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:116
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "Abrindo as tarefas «%s»"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:545
-msgid "Task List Selector"
-msgstr "Selector de lista de tarefas"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "Print Tasks"
 msgstr "Imprimir as tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:290
+#: ../modules/calendar/e-task-shell-view-actions.c:259
 msgid "Task List Properties"
 msgstr "Propiedades da lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:529
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17821,111 +19865,107 @@ msgstr ""
 "\n"
 "Está seguro de que desexa eliminalas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:592
+#: ../modules/calendar/e-task-shell-view-actions.c:536
 msgid "Do not ask me again"
 msgstr "Non preguntar de novo."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/calendar/e-task-shell-view-actions.c:654
 msgid "_Delete Task"
 msgstr "E_liminar a tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:661
 msgid "_Find in Task..."
 msgstr "Buscar na tare_fa…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "Search for text in the displayed task"
 msgstr "Buscar un texto na tarefa mostrada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:682
 msgid "D_elete Task List"
 msgstr "_Eliminar a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete the selected task list"
 msgstr "Eliminar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:689
 msgid "_New Task List"
 msgstr "Lista de tarefas _nova"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "Refresh the selected task list"
 msgstr "Actualizar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Rename the selected task list"
 msgstr "Renomear a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Show _Only This Task List"
 msgstr "M_ostrar só esta lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Delete completed tasks"
 msgstr "Eliminar as tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:836
 msgid "Task _Preview"
 msgstr "_Previsualizar a tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Show task preview pane"
 msgstr "Mostrar o panel de vista previa de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:859
 msgid "Show task preview below the task list"
 msgstr "Mostrar a vista previa da tarefa embaixo da lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "Show task preview alongside the task list"
 msgstr "Mostrar a vista previa da tarefa a carón da lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:930
+#: ../modules/calendar/e-task-shell-view-actions.c:874
 msgid "Active Tasks"
 msgstr "Tarefas activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos próximos sete días"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:902
 msgid "Overdue Tasks"
 msgstr "Tarefas atrasadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:909
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1015
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Print the list of tasks"
 msgstr "Imprimir a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Preview the list of tasks to be printed"
 msgstr "Previsualizar a lista de tarefas para imprimir"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:315
 msgid "Delete Tasks"
 msgstr "Eliminar as tarefas"
 
-#: ../modules/calendar/e-task-shell-view.c:375
+#: ../modules/calendar/e-task-shell-view.c:317
 msgid "Delete Task"
 msgstr "Eliminar a tarefa"
 
-#: ../modules/calendar/e-task-shell-view-private.c:632
-msgid "Expunging"
-msgstr "Compactando"
-
-#: ../modules/calendar/e-task-shell-view-private.c:743
+#: ../modules/calendar/e-task-shell-view-private.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -18315,7 +20355,7 @@ msgid "Start day:"
 msgstr "Día de inicio:"
 
 #: ../modules/itip-formatter/itip-view.c:681
-#: ../modules/itip-formatter/itip-view.c:1504
+#: ../modules/itip-formatter/itip-view.c:1494
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
@@ -18324,244 +20364,244 @@ msgid "End day:"
 msgstr "Día de finalización:"
 
 #: ../modules/itip-formatter/itip-view.c:690
-#: ../modules/itip-formatter/itip-view.c:1505
+#: ../modules/itip-formatter/itip-view.c:1495
 msgid "End time:"
 msgstr "Hora de finalización:"
 
-#: ../modules/itip-formatter/itip-view.c:1030
+#: ../modules/itip-formatter/itip-view.c:1020
 msgid "Ope_n Calendar"
 msgstr "_Abrir calendario"
 
-#: ../modules/itip-formatter/itip-view.c:1033
+#: ../modules/itip-formatter/itip-view.c:1023
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../modules/itip-formatter/itip-view.c:1036
+#: ../modules/itip-formatter/itip-view.c:1026
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1029
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1032
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1035
 msgid "Acce_pt all"
 msgstr "A_ceptar todo"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1038
 msgid "Acce_pt"
 msgstr "Ace_ptar"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1041
 msgid "Send _Information"
 msgstr "Enviar _información"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1044
 msgid "_Update Attendee Status"
 msgstr "_Actualizar o estado do participante"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1047
 msgid "_Update"
 msgstr "_Actualizar"
 
-#: ../modules/itip-formatter/itip-view.c:1507
-#: ../modules/itip-formatter/itip-view.c:1555
-#: ../modules/itip-formatter/itip-view.c:1626
+#: ../modules/itip-formatter/itip-view.c:1497
+#: ../modules/itip-formatter/itip-view.c:1545
+#: ../modules/itip-formatter/itip-view.c:1616
 msgid "Comment:"
 msgstr "Comentario:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1543
+#: ../modules/itip-formatter/itip-view.c:1533
 msgid "Send reply to sender"
 msgstr "Responder ao remitente"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1548
 msgid "Send _updates to attendees"
 msgstr "Enviar _actualizacións aos participantes"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1561
+#: ../modules/itip-formatter/itip-view.c:1551
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas as instancias"
 
-#: ../modules/itip-formatter/itip-view.c:1562
+#: ../modules/itip-formatter/itip-view.c:1552
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../modules/itip-formatter/itip-view.c:1563
+#: ../modules/itip-formatter/itip-view.c:1553
 msgid "_Preserve my reminder"
 msgstr "_Conservar o meu recordatorio"
 
-#: ../modules/itip-formatter/itip-view.c:1564
+#: ../modules/itip-formatter/itip-view.c:1554
 msgid "_Inherit reminder"
 msgstr "_Herdar recordatorio"
 
-#: ../modules/itip-formatter/itip-view.c:1894
+#: ../modules/itip-formatter/itip-view.c:1884
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../modules/itip-formatter/itip-view.c:1897
+#: ../modules/itip-formatter/itip-view.c:1887
 msgid "_Memos:"
 msgstr "_Notas:"
 
-#: ../modules/itip-formatter/itip-view.c:3125
+#: ../modules/itip-formatter/itip-view.c:3115
 msgid "Sa_ve"
 msgstr "Gar_dar"
 
-#: ../modules/itip-formatter/itip-view.c:3585
-#: ../modules/itip-formatter/itip-view.c:5032
+#: ../modules/itip-formatter/itip-view.c:3575
+#: ../modules/itip-formatter/itip-view.c:5022
 msgid "Attendee status updated"
 msgstr "Actualizouse o estado de participante"
 
-#: ../modules/itip-formatter/itip-view.c:3764
+#: ../modules/itip-formatter/itip-view.c:3754
 #, 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:3793
+#: ../modules/itip-formatter/itip-view.c:3783
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizouse a cita no calendario «%s»"
 
-#: ../modules/itip-formatter/itip-view.c:3906
+#: ../modules/itip-formatter/itip-view.c:3896
 msgid "Unable to find any calendars"
 msgstr "Non é posíbel atopar ningún calendario"
 
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../modules/itip-formatter/itip-view.c:3904
 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:3919
+#: ../modules/itip-formatter/itip-view.c:3909
 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:3924
+#: ../modules/itip-formatter/itip-view.c:3914
 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:4268
+#: ../modules/itip-formatter/itip-view.c:4258
 msgid "Opening the calendar. Please wait..."
 msgstr "Abrindo o calendario. Agarde…"
 
-#: ../modules/itip-formatter/itip-view.c:4273
+#: ../modules/itip-formatter/itip-view.c:4263
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versión existente desta cita"
 
-#: ../modules/itip-formatter/itip-view.c:4668
+#: ../modules/itip-formatter/itip-view.c:4658
 #, 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:4683
+#: ../modules/itip-formatter/itip-view.c:4673
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario «%s» como aceptado"
 
-#: ../modules/itip-formatter/itip-view.c:4688
+#: ../modules/itip-formatter/itip-view.c:4678
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario «%s» como provisional"
 
-#: ../modules/itip-formatter/itip-view.c:4694
+#: ../modules/itip-formatter/itip-view.c:4684
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario «%s» como rexeitado"
 
-#: ../modules/itip-formatter/itip-view.c:4700
+#: ../modules/itip-formatter/itip-view.c:4690
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario «%s» como cancelado"
 
-#: ../modules/itip-formatter/itip-view.c:4721
-#: ../modules/itip-formatter/itip-view.c:5178
-#: ../modules/itip-formatter/itip-view.c:5284
+#: ../modules/itip-formatter/itip-view.c:4711
+#: ../modules/itip-formatter/itip-view.c:5168
+#: ../modules/itip-formatter/itip-view.c:5274
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Gardando os cambios no calendario. Agarde…"
 
-#: ../modules/itip-formatter/itip-view.c:4762
+#: ../modules/itip-formatter/itip-view.c:4752
 msgid "Unable to parse item"
 msgstr "Non é posíbel analizar o elemento"
 
-#: ../modules/itip-formatter/itip-view.c:4955
+#: ../modules/itip-formatter/itip-view.c:4945
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador retirou o delegado %s "
 
-#: ../modules/itip-formatter/itip-view.c:4972
+#: ../modules/itip-formatter/itip-view.c:4962
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviouse unha notificación de cancelación ao delegado"
 
-#: ../modules/itip-formatter/itip-view.c:4976
+#: ../modules/itip-formatter/itip-view.c:4966
 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:5024
+#: ../modules/itip-formatter/itip-view.c:5014
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non é posíbel actualizar o participante. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5067
+#: ../modules/itip-formatter/itip-view.c:5057
 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:5143
+#: ../modules/itip-formatter/itip-view.c:5133
 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:5215
-#: ../modules/itip-formatter/itip-view.c:5254
+#: ../modules/itip-formatter/itip-view.c:5205
+#: ../modules/itip-formatter/itip-view.c:5244
 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:5317
+#: ../modules/itip-formatter/itip-view.c:5307
 msgid "Meeting information sent"
 msgstr "Enviouse a información da reunión"
 
-#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5312
 msgid "Task information sent"
 msgstr "Enviouse a información da tarefa"
 
-#: ../modules/itip-formatter/itip-view.c:5327
+#: ../modules/itip-formatter/itip-view.c:5317
 msgid "Memo information sent"
 msgstr "Enviouse a información da nota"
 
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../modules/itip-formatter/itip-view.c:5328
 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:5343
+#: ../modules/itip-formatter/itip-view.c:5333
 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:5348
+#: ../modules/itip-formatter/itip-view.c:5338
 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:5413
+#: ../modules/itip-formatter/itip-view.c:5403
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5418
+#: ../modules/itip-formatter/itip-view.c:5408
 msgid "Save Calendar"
 msgstr "Gardar o calendario"
 
-#: ../modules/itip-formatter/itip-view.c:5467
-#: ../modules/itip-formatter/itip-view.c:5480
+#: ../modules/itip-formatter/itip-view.c:5457
+#: ../modules/itip-formatter/itip-view.c:5470
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexado non é válido"
 
-#: ../modules/itip-formatter/itip-view.c:5468
-#: ../modules/itip-formatter/itip-view.c:5481
+#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5471
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18569,15 +20609,15 @@ msgstr ""
 "A mensaxe di que contén un calendario pero o calendario non é un iCalendar "
 "correcto."
 
-#: ../modules/itip-formatter/itip-view.c:5523
-#: ../modules/itip-formatter/itip-view.c:5553
-#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5513
+#: ../modules/itip-formatter/itip-view.c:5543
+#: ../modules/itip-formatter/itip-view.c:5644
 msgid "The item in the calendar is not valid"
 msgstr "O elemento do calendario non é válido"
 
-#: ../modules/itip-formatter/itip-view.c:5524
-#: ../modules/itip-formatter/itip-view.c:5554
-#: ../modules/itip-formatter/itip-view.c:5655
+#: ../modules/itip-formatter/itip-view.c:5514
+#: ../modules/itip-formatter/itip-view.c:5544
+#: ../modules/itip-formatter/itip-view.c:5645
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18585,11 +20625,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:5569
+#: ../modules/itip-formatter/itip-view.c:5559
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexado contén múltiples elementos"
 
-#: ../modules/itip-formatter/itip-view.c:5570
+#: ../modules/itip-formatter/itip-view.c:5560
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18597,24 +20637,24 @@ msgstr ""
 "Para procesar todos estes elementos, debería gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../modules/itip-formatter/itip-view.c:6072
+#: ../modules/itip-formatter/itip-view.c:6062
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ningún"
 
-#: ../modules/itip-formatter/itip-view.c:6088
+#: ../modules/itip-formatter/itip-view.c:6078
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../modules/itip-formatter/itip-view.c:6248
+#: ../modules/itip-formatter/itip-view.c:6238
 msgid "This meeting recurs"
 msgstr "Esta cita repítese"
 
-#: ../modules/itip-formatter/itip-view.c:6251
+#: ../modules/itip-formatter/itip-view.c:6241
 msgid "This task recurs"
 msgstr "Esta tarefa repítese"
 
-#: ../modules/itip-formatter/itip-view.c:6254
+#: ../modules/itip-formatter/itip-view.c:6244
 msgid "This memo recurs"
 msgstr "Esta nota repítese"
 
@@ -18659,19 +20699,19 @@ msgstr "Formatador iTip"
 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:251
+#: ../modules/mail-config/e-mail-config-google-summary.c:250
 msgid "Google Features"
 msgstr "Características de Google"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:260
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Add Google Ca_lendar to this account"
 msgstr "Engadir un ca_lendario de Google a esta conta"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:267
 msgid "Add Google Con_tacts to this account"
 msgstr "Engadir un con_tacto de Google a esta conta"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:276
+#: ../modules/mail-config/e-mail-config-google-summary.c:275
 msgid "You may need to enable IMAP access"
 msgstr "Pode que deba activar o acceso IMAP"
 
@@ -18713,60 +20753,60 @@ msgid "Choose a mbox spool directory"
 msgstr "Seleccione un cartafol spool de mbox"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:136
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Configuración"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "_Port:"
 msgstr "_Porto:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
 msgid "User_name:"
 msgstr "_Nome do usuario:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "Encryption _method:"
 msgstr "_Método de cifrado:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS despois de conectarse"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
 msgid "SSL on a dedicated port"
 msgstr "SSL nun porto adicado"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "_Usar binario personalizado, no lugar de «sendmail»"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
 msgid "_Custom binary:"
 msgstr "Binario _personalizado:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
 msgid "U_se custom arguments"
 msgstr "U_sar argumentos personalizados"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
 msgid "Cus_tom arguments:"
 msgstr "Argumentos persona_lizados:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -18776,23 +20816,23 @@ msgstr ""
 "   %F - é o enderezo de Desde\n"
 "   %R - é o enderezo do remitente"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
 msgid "Send mail also when in offline _mode"
 msgstr "Enviar correo electrónico incluso no _modo desconectado"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor solicita autenticación"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
 msgid "Yahoo! Features"
 msgstr "Características de Yahoo!"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Engadir Ca_lendario e Tarefas de Yahoo! a esta conta"
 
@@ -18804,361 +20844,361 @@ msgid_plural "%d attached messages"
 msgstr[0] "%d mensaxe anexada"
 msgstr[1] "%d mensaxes anexadas"
 
-#: ../modules/mail/e-mail-shell-backend.c:314
+#: ../modules/mail/e-mail-shell-backend.c:348
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaxe de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:316
+#: ../modules/mail/e-mail-shell-backend.c:350
 msgid "Compose a new mail message"
 msgstr "Escribir unha mensaxe de correo nova"
 
-#: ../modules/mail/e-mail-shell-backend.c:324
+#: ../modules/mail/e-mail-shell-backend.c:358
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Conta de _correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:326
+#: ../modules/mail/e-mail-shell-backend.c:360
 msgid "Create a new mail account"
 msgstr "Crear unha nova conta de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Carta_fol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../modules/mail/e-mail-shell-backend.c:367
 msgid "Create a new mail folder"
 msgstr "Crear un novo cartafol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:644
+#: ../modules/mail/e-mail-shell-backend.c:682
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:653
+#: ../modules/mail/e-mail-shell-backend.c:691
 msgid "Mail Preferences"
 msgstr "Preferencias de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:662
+#: ../modules/mail/e-mail-shell-backend.c:700
 msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:672
+#: ../modules/mail/e-mail-shell-backend.c:710
 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:964
+#: ../modules/mail/e-mail-shell-backend.c:1002
 msgctxt "label"
 msgid "None"
 msgstr "Ningún"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:670
+#: ../modules/mail/e-mail-shell-view-actions.c:749
 msgid "Marking messages as read..."
 msgstr "Marcando mensaxes como lidas…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1605
 msgid "_Disable Account"
 msgstr "_Desactivar a conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Disable this account"
 msgstr "Desactivar esta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 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:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Edit properties of this account"
 msgstr "Modificar as propiedades desta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 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:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar as mensaxes para o uso sen conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 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:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saída"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "_Copy Folder To..."
 msgstr "_Copiar o cartafol a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../modules/mail/e-mail-shell-view-actions.c:1649
 msgid "Copy the selected folder into another folder"
 msgstr "Copiar o cartafol seleccionado noutro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1656
 msgid "Permanently remove this folder"
 msgstr "Retirar permanentemente este cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1661
 msgid "E_xpunge"
 msgstr "Com_pactar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1663
 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:1575
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
 msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1670
+#: ../modules/mail/e-mail-shell-view-actions.c:1770
 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:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "_Move Folder To..."
 msgstr "_Mover o cartafol a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
 msgid "Move the selected folder into another folder"
 msgstr "Mover o cartafol seleccionado a outro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "_New..."
 msgstr "_Novo…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1591
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 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:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Change the properties of this folder"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Change the name of this folder"
 msgstr "Modificar o nome deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "Select Message _Thread"
 msgstr "Seleccionar o _fío desta mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 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:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar o fío sec_undario desta mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas as respostas á mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 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:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "N_one"
 msgstr "Nin_gún"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 msgid "_Manage Subscriptions"
 msgstr "Xestionar as _subscricións"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../modules/mail/e-mail-shell-view-actions.c:1763
+#: ../modules/mail/e-mail-shell-view-actions.c:1847
 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:1682
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/mail/e-mail-shell-view-actions.c:1796
 msgid "Send / _Receive"
 msgstr "Enviar / _Recibir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1777
 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:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1782
 msgid "R_eceive All"
 msgstr "R_ecibir todos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1784
 msgid "Receive new items from all accounts"
 msgstr "Recibir os elementos novos de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1789
 msgid "_Send All"
 msgstr "_Enviar todos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1791
 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:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1819
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operación de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1824
 msgid "Collapse All _Threads"
 msgstr "Pregar todos os _fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1826
 msgid "Collapse all message threads"
 msgstr "Pregar todos os fíos de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1831
 msgid "E_xpand All Threads"
 msgstr "D_espregar todos os fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1833
 msgid "Expand all message threads"
 msgstr "Despregar todas as conversas do fío"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1838
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1840
 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:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1845
 msgid "_Subscriptions..."
 msgstr "_Subscricións…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1854
 msgid "F_older"
 msgstr "Cartaf_ol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1861
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/mail/e-mail-shell-view-actions.c:1878
 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:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1885
 msgid "Search F_olders"
 msgstr "Cartaf_oles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1887
 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:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1926
 msgid "_New Folder..."
 msgstr "Cartafol _novo…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1954
 msgid "Show Message _Preview"
 msgstr "Mostrar a vista _previa da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1863
+#: ../modules/mail/e-mail-shell-view-actions.c:1956
 msgid "Show message preview pane"
 msgstr "Mostrar o panel de vista previa das mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1962
 msgid "Show _Deleted Messages"
 msgstr "Mostrar as mensaxes _eliminadas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../modules/mail/e-mail-shell-view-actions.c:1964
 msgid "Show deleted messages with a line through them"
 msgstr "Mostrar as mensaxes eliminadas riscándoas."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1877
+#: ../modules/mail/e-mail-shell-view-actions.c:1970
 msgid "_Group By Threads"
 msgstr "A_grupar por fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1972
 msgid "Threaded message list"
 msgstr "Lista de mensaxes por fío"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1978
 msgid "_Unmatched Folder Enabled"
 msgstr "Cartafol non _coincidente activado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1980
 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:1907
+#: ../modules/mail/e-mail-shell-view-actions.c:2000
 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:1914
+#: ../modules/mail/e-mail-shell-view-actions.c:2007
 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:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:2015
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1936
+#: ../modules/mail/e-mail-shell-view-actions.c:2029
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos últimos 5 días"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1943
+#: ../modules/mail/e-mail-shell-view-actions.c:2036
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1950
+#: ../modules/mail/e-mail-shell-view-actions.c:2043
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1957
+#: ../modules/mail/e-mail-shell-view-actions.c:2050
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2023
+#: ../modules/mail/e-mail-shell-view-actions.c:2116
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteñen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2126
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2133
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2140
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
@@ -19170,122 +21210,125 @@ msgstr "Buscar en todas as contas"
 msgid "Account Search"
 msgstr "Buscar na conta"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:978
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionada, "
 msgstr[1] "%d seleccionadas, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:981
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:987
+#: ../modules/mail/e-mail-shell-view-private.c:1004
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminada"
 msgstr[1] "%d eliminadas"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
 #: ../modules/mail/e-mail-shell-view-private.c:1013
+#: ../modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d correo lixo"
 msgstr[1] "%d correos lixo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sen enviar"
 msgstr[1] "%d sen enviar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1038
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1050
 #, 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:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1053
 #, 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:1068
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "Lixo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1505
+#: ../modules/mail/e-mail-shell-view-private.c:1561
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../modules/mail/em-composer-prefs.c:394
 msgid "Select Folder to Add"
 msgstr "Seleccione un cartafol a engadir"
 
-#: ../modules/mail/em-composer-prefs.c:888
+#: ../modules/mail/em-composer-prefs.c:854
 msgid "Folder"
 msgstr "Cartafol"
 
-#: ../modules/mail/em-composer-prefs.c:924
+#: ../modules/mail/em-composer-prefs.c:890
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: ../modules/mail/em-composer-prefs.c:1195
+#: ../modules/mail/em-composer-prefs.c:1177
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "On exit, every time"
 msgstr "Ao saír, cada vez"
 
-#: ../modules/mail/em-mailer-prefs.c:81
-msgid "On exit, once per day"
+#: ../modules/mail/em-mailer-prefs.c:80
+#, fuzzy
+msgid "Once per day"
 msgstr "Ao saír, unha vez ao día"
 
-#: ../modules/mail/em-mailer-prefs.c:82
-msgid "On exit, once per week"
+#: ../modules/mail/em-mailer-prefs.c:81
+#, fuzzy
+msgid "Once per week"
 msgstr "Ao saír, unha vez á semana"
 
-#: ../modules/mail/em-mailer-prefs.c:83
-msgid "On exit, once per month"
+#: ../modules/mail/em-mailer-prefs.c:82
+#, fuzzy
+msgid "Once per month"
 msgstr "Ao saír, unha vez ao mes"
 
-#: ../modules/mail/em-mailer-prefs.c:84
+#: ../modules/mail/em-mailer-prefs.c:83
 msgid "Immediately, on folder leave"
 msgstr "Inmediatamente, ao deixar o cartafol"
 
-#: ../modules/mail/em-mailer-prefs.c:355
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "Cabeceira"
 
-#: ../modules/mail/em-mailer-prefs.c:359
+#: ../modules/mail/em-mailer-prefs.c:360
 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:1214
+#: ../modules/mail/em-mailer-prefs.c:1224
 msgid "_Date header:"
 msgstr "_Cabeceira da data:"
 
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1225
 msgid "Show _original header value"
 msgstr "Mostrar o valor _orixinal da cabeceira"
 
@@ -19297,24 +21340,24 @@ msgstr ""
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:307
+#: ../modules/mdn/evolution-mdn.c:304
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "A mensaxe a %s sobre «%s» o %s leuse."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:374
+#: ../modules/mdn/evolution-mdn.c:370
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Notificación de recepción para «%s»"
 
-#: ../modules/mdn/evolution-mdn.c:539
+#: ../modules/mdn/evolution-mdn.c:531
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Enviar unha confirmación de recepción a «%s»"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:544
+#: ../modules/mdn/evolution-mdn.c:536
 msgid "_Notify Sender"
 msgstr "_Notificar ao emisor"
 
@@ -19486,21 +21529,27 @@ msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Isto fará que SpamAssassin sexa máis fiábel, pero tamén máis lento"
 
 #: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#, fuzzy
+msgid "Junk filter using SpamAssassin"
+msgstr "Filtra os correos non desexados usando o SpamAssassin."
+
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:261
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "Importando os ficheiros"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
 msgid "Import cancelled."
 msgstr "Importación cancelada."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
 msgid "Import complete."
 msgstr "Importación rematada."
 
@@ -19528,11 +21577,11 @@ msgstr "_Formatar como…"
 msgid "_Other languages"
 msgstr "_Outros idiomas"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Text Highlight"
 msgstr "Realzado do texto"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
 msgid "Syntax highlighting of mail parts"
 msgstr "Realzado de sintaxe das partes do correo"
 
@@ -19560,10 +21609,6 @@ msgstr "_C#"
 msgid "_Cascade Style Sheet"
 msgstr "Folla de estilo en _cascada"
 
-#: ../modules/text-highlight/languages.c:72
-msgid "_HTML"
-msgstr "_HTML"
-
 #: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Java"
@@ -19791,7 +21836,7 @@ msgstr "Formatar parte como contacto da axenda de enderezos"
 msgid "Evolution Web Inspector"
 msgstr "Inspector web de Evolution"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#: ../plugins/attachment-reminder/attachment-reminder.c:123
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
 
@@ -19828,37 +21873,37 @@ msgstr "Aviso de anexos"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Avisarao se esquece engadir un anexo á mensaxe de correo."
 
-#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:694 ../plugins/bbdb/bbdb.c:703
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:718
 msgid "Create _address book entries when sending mails"
 msgstr "Crear _as entradas da axenda de enderezos ao enviar as mensaxes"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:725
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccionar a axenda de enderezos para contactos automáticos"
 
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:742
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensaxería instantánea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:757
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "_Sincronizar a información e as imaxes de contactos desde a lista de amigos "
 "do Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:706
+#: ../plugins/bbdb/bbdb.c:764
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccionar a axenda de enderezos para a lista de amigos do Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:719
+#: ../plugins/bbdb/bbdb.c:777
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar coa lista de _amigos agora"
 
@@ -19936,12 +21981,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ningún"
 
-#: ../plugins/email-custom-header/email-custom-header.c:538
+#: ../plugins/email-custom-header/email-custom-header.c:539
 msgid "_Custom Header"
 msgstr "Cabeceira p_ersonalizada"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:808
+#: ../plugins/email-custom-header/email-custom-header.c:809
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -19949,11 +21994,11 @@ msgstr ""
 "O formato para indicar un valor de chave de cabeceira personalizada é:\n"
 "nome dos valores da chave da cabeceira personalizada separados por «;»."
 
-#: ../plugins/email-custom-header/email-custom-header.c:861
+#: ../plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/email-custom-header/email-custom-header.c:879
 #: ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "Valores"
@@ -19987,8 +22032,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:417
-#: ../plugins/external-editor/external-editor.c:419
+#: ../plugins/external-editor/external-editor.c:467
+#: ../plugins/external-editor/external-editor.c:469
 msgid "Compose in External Editor"
 msgstr "Escribir no editor externo"
 
@@ -20087,14 +22132,6 @@ msgstr ""
 "O ficheiro que seleccionou non semella ser unha imaxe .png correcta. Erro: "
 "{0}"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "Imaxe inserida"
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "Mostrar as imaxes anexadas directamente nas mensaxes de correo."
-
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
 msgstr "Obter o _arquivo da lista"
@@ -20552,11 +22589,11 @@ 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:1142
+#: ../plugins/publish-calendar/publish-calendar.c:1144
 msgid "Could not create publish thread."
 msgstr "Non foi posíbel crear o fío para publicar."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1152
+#: ../plugins/publish-calendar/publish-calendar.c:1154
 msgid "_Publish Calendar Information"
 msgstr "_Publicar a información do calendario"
 
@@ -20637,6 +22674,7 @@ msgid "_Username:"
 msgstr "_Nome do usuario:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:759
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
@@ -20766,27 +22804,27 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "_Formato:"
 
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "Seleccionar un ficheiro de destino"
 
-#: ../plugins/save-calendar/save-calendar.c:190
+#: ../plugins/save-calendar/save-calendar.c:188
 msgid "_Save As"
 msgstr "_Gardar como"
 
-#: ../plugins/save-calendar/save-calendar.c:347
+#: ../plugins/save-calendar/save-calendar.c:344
 msgid "Save the selected calendar to disk"
 msgstr "Gardar o calendario seleccionado no disco"
 
-#: ../plugins/save-calendar/save-calendar.c:378
+#: ../plugins/save-calendar/save-calendar.c:375
 msgid "Save the selected memo list to disk"
 msgstr "Gardar a lista de notas seleccionada no disco"
 
-#: ../plugins/save-calendar/save-calendar.c:409
+#: ../plugins/save-calendar/save-calendar.c:406
 msgid "Save the selected task list to disk"
 msgstr "Gardar a lista de tarefas seleccionada no disco"
 
@@ -20800,31 +22838,31 @@ 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:1146
+#: ../plugins/templates/templates.c:1199
 msgid "No Title"
 msgstr "Sen título"
 
-#: ../plugins/templates/templates.c:1255
+#: ../plugins/templates/templates.c:1308
 msgid "Save as _Template"
 msgstr "Gardar como un _modelo"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1310
 msgid "Save as Template"
 msgstr "Gardar como un modelo"
 
-#: ../shell/e-shell.c:302
+#: ../shell/e-shell.c:319
 msgid "Preparing to go offline..."
 msgstr "Preparando a desconexión…"
 
-#: ../shell/e-shell.c:355
+#: ../shell/e-shell.c:372
 msgid "Preparing to go online..."
 msgstr "Preparando a conexión…"
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:453
 msgid "Preparing to quit"
 msgstr "Preparando a saída"
 
-#: ../shell/e-shell.c:442
+#: ../shell/e-shell.c:459
 msgid "Preparing to quit..."
 msgstr "Preparando a saída…"
 
@@ -20840,19 +22878,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:937
+#: ../shell/e-shell-searchbar.c:930
 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:962
+#: ../shell/e-shell-searchbar.c:955
 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:1030
+#: ../shell/e-shell-searchbar.c:1023
 msgid "i_n"
 msgstr "e_n"
 
@@ -20864,7 +22902,7 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "Todos os ficheiros (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr "Gardando o estado da interface do usuario"
 
@@ -21176,7 +23214,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:181
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -21212,7 +23250,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:206
+#: ../shell/main.c:205
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -21220,13 +23258,13 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:211
 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:301
+#: ../shell/main.c:300
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -21234,39 +23272,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:305
+#: ../shell/main.c:304
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometría indicada á xanela principal"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:308
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:310
 msgid "Ignore network availability"
 msgstr "Ignorar a dispoñibilidade da rede"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:313
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche do Evolution"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:316
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de todos os engadidos."
 
-#: ../shell/main.c:319
+#: ../shell/main.c:318
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de vista previa de correo, contactos e tarefas."
 
-#: ../shell/main.c:323
+#: ../shell/main.c:322
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Importar URI ou nomes de ficheiros fornecidos como argumentos."
 
-#: ../shell/main.c:325
+#: ../shell/main.c:324
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar a saída dun proceso de execución do Evolution"
 
-#: ../shell/main.c:402
+#: ../shell/main.c:401
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -21275,11 +23313,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:496 ../shell/main.c:501
+#: ../shell/main.c:452 ../shell/main.c:457
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de correo e XIP Evolution"
 
-#: ../shell/main.c:568
+#: ../shell/main.c:517
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21288,7 +23326,7 @@ msgstr ""
 "%s: non é posíbel usar á vez --online e --offline.\n"
 "  Use «%s --help» para máis información.\n"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:523
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21335,7 +23373,7 @@ msgstr ""
 "Porén, como solución pode intentar anovar primeiro a Evolution 2 e despois a "
 "Evolution 3."
 
-#: ../smime/gui/ca-trust-dialog.c:108
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21346,101 +23384,174 @@ msgstr ""
 "\n"
 "Editar os axustes de confianza:"
 
-#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:121
 msgid "Certificate Name"
 msgstr "Nome do certificado"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-msgid "Issued To Organization"
-msgstr "Expedido á organi_zación:"
-
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-msgid "Issued To Organizational Unit"
-msgstr "Expedido á unidade organizativa (OU)"
-
 #: ../smime/gui/certificate-manager.c:83
 #: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
-msgid "Serial Number"
-msgstr "Número de serie"
+msgid "Issued To Organization"
+msgstr "Expedido á organi_zación:"
 
 #: ../smime/gui/certificate-manager.c:84
 #: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
-msgid "Purposes"
-msgstr "Propósitos"
+msgid "Issued To Organizational Unit"
+msgstr "Expedido á unidade organizativa (OU)"
 
 #: ../smime/gui/certificate-manager.c:85
 #: ../smime/gui/certificate-manager.c:105
 #: ../smime/gui/certificate-manager.c:123
-msgid "Issued By"
-msgstr "Emitido por"
+msgid "Serial Number"
+msgstr "Número de serie"
 
 #: ../smime/gui/certificate-manager.c:86
 #: ../smime/gui/certificate-manager.c:106
 #: ../smime/gui/certificate-manager.c:124
-msgid "Issued By Organization"
-msgstr "Expedido pola organi_zación:"
+msgid "Purposes"
+msgstr "Propósitos"
 
 #: ../smime/gui/certificate-manager.c:87
 #: ../smime/gui/certificate-manager.c:107
 #: ../smime/gui/certificate-manager.c:125
-msgid "Issued By Organizational Unit"
-msgstr "Expedido pola unidade organizativa (UO)"
+msgid "Issued By"
+msgstr "Emitido por"
 
 #: ../smime/gui/certificate-manager.c:88
 #: ../smime/gui/certificate-manager.c:108
 #: ../smime/gui/certificate-manager.c:126
-msgid "Issued"
-msgstr "Emitido"
+msgid "Issued By Organization"
+msgstr "Expedido pola organi_zación:"
 
 #: ../smime/gui/certificate-manager.c:89
 #: ../smime/gui/certificate-manager.c:109
 #: ../smime/gui/certificate-manager.c:127
-msgid "Expires"
-msgstr "Caduca"
+msgid "Issued By Organizational Unit"
+msgstr "Expedido pola unidade organizativa (UO)"
 
 #: ../smime/gui/certificate-manager.c:90
 #: ../smime/gui/certificate-manager.c:110
 #: ../smime/gui/certificate-manager.c:128
-msgid "SHA1 Fingerprint"
-msgstr "Impresión dixital SHA1"
+msgid "Issued"
+msgstr "Emitido"
 
 #: ../smime/gui/certificate-manager.c:91
 #: ../smime/gui/certificate-manager.c:111
 #: ../smime/gui/certificate-manager.c:129
+msgid "Expires"
+msgstr "Caduca"
+
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
+msgid "SHA1 Fingerprint"
+msgstr "Impresión dixital SHA1"
+
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:131
 msgid "MD5 Fingerprint"
 msgstr "Impresión dixital MD5"
 
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:122
 msgid "Email Address"
 msgstr "Enderezo de correo"
 
-#: ../smime/gui/certificate-manager.c:621
-msgid "Select a certificate to import..."
-msgstr "Seleccionar un certificado para importar…"
+#: ../smime/gui/certificate-manager.c:637
+msgid "Select a file to backup your key and certificate..."
+msgstr ""
+
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:649
+#, c-format
+msgid "%s-backup.p12"
+msgstr ""
 
-#: ../smime/gui/certificate-manager.c:635
+#: ../smime/gui/certificate-manager.c:663
+#: ../smime/gui/certificate-manager.c:952
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../smime/gui/certificate-manager.c:671
+#: ../smime/gui/certificate-manager.c:715
+#, fuzzy
+msgid "Backup Certificate"
+msgstr "Certificado"
+
+#. filename selection
+#: ../smime/gui/certificate-manager.c:729
+#, fuzzy
+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:734
+#, fuzzy
+msgid "Please select a file..."
+msgstr "Seleccionar un cartafol"
+
+#: ../smime/gui/certificate-manager.c:748
+msgid "_Include certificate chain in the backup"
+msgstr ""
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:754
+msgid ""
+"The certificate backup password you set here protects the backup file that "
+"you are about to create.\n"
+"You must set this password to proceed with the backup."
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:773
+#, fuzzy
+msgid "_Repeat Password:"
+msgstr "_Contrasinal:"
+
+#: ../smime/gui/certificate-manager.c:792
+msgid "Passwords do not match"
+msgstr ""
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:800
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:845
+#, fuzzy
+msgid "No file name provided"
+msgstr "Non se forneceu ningún enderezo de correo"
+
+#: ../smime/gui/certificate-manager.c:849
+#, fuzzy
+msgid "Failed to backup key and certificate"
+msgstr "Produciuse un erro ao importar o certificado"
+
+#: ../smime/gui/certificate-manager.c:938
+msgid "Select a certificate to import..."
+msgstr "Seleccionar un certificado para importar…"
+
+#: ../smime/gui/certificate-manager.c:988
 msgid "Failed to import certificate"
 msgstr "Produciuse un erro ao importar o certificado"
 
-#: ../smime/gui/certificate-manager.c:1053
+#: ../smime/gui/certificate-manager.c:1376
 msgid "All PKCS12 files"
 msgstr "Todos os ficheiros PKCS12"
 
-#: ../smime/gui/certificate-manager.c:1070
+#: ../smime/gui/certificate-manager.c:1393
 msgid "All email certificate files"
 msgstr "Todos os ficheiros de certificados de correo"
 
-#: ../smime/gui/certificate-manager.c:1087
+#: ../smime/gui/certificate-manager.c:1410
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros de certificados dunha EA"
 
@@ -21483,26 +23594,7 @@ msgstr "Introduza o contrasinal novo para a base de datos de certificados"
 msgid "Enter new password"
 msgstr "Introduza un contrasinal novo"
 
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
-#, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"Emitido a:\n"
-"  Titular: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:122
-#, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"Emitido por:\n"
-"  Titular: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:175
+#: ../smime/gui/e-cert-selector.c:180
 msgid "Select certificate"
 msgstr "Seleccionar un certificado"
 
@@ -21575,22 +23667,18 @@ msgid "Certificate"
 msgstr "Certificado"
 
 #: ../smime/gui/smime-ui.ui.h:26
-msgid "Certificate details"
-msgstr "Información do certificado"
-
-#: ../smime/gui/smime-ui.ui.h:27
 msgid "Email Certificate Trust Settings"
 msgstr "Axustes de confianza de certificados de correo"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Trust the authenticity of this certificate"
 msgstr "Confiar na autenticidade deste certificado"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Non confiar na autenticidade deste certificado"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "_Edit CA Trust"
 msgstr "_Editar a confianza na EA"
 
@@ -21607,19 +23695,44 @@ msgstr "Sinatura"
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:782
 msgid "Certificate already exists"
 msgstr "O certificado xa existe"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
 msgstr "Contrasinal para o ficheiro PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduza un contrasinal para o ficheiro PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:307
+#: ../smime/lib/e-pkcs12.c:329
+#, fuzzy, c-format
+msgid "Unable to create export context, err_code: %i"
+msgstr "Non foi posíbel reservar un recurso, erro: %s"
+
+#: ../smime/lib/e-pkcs12.c:336
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:346
+#, fuzzy, c-format
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "Non é posíbel crear os cartafoles de correo local en «%s»: %s"
+
+#: ../smime/lib/e-pkcs12.c:364
+#, fuzzy, c-format
+msgid "Unable to add key/cert to the store, err_code: %i"
+msgstr "Non foi posíbel reservar un recurso, erro: %s"
+
+#: ../smime/lib/e-pkcs12.c:382
+#, fuzzy, c-format
+msgid "Unable to write store to disk, err_code: %i"
+msgstr "Non foi posíbel reservar un recurso, erro: %s"
+
+#: ../smime/lib/e-pkcs12.c:409
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
@@ -21695,6 +23808,102 @@ msgstr "Con _data de vencemento"
 msgid "With _Status"
 msgstr "Con e_stado"
 
+#~ msgid "Web addresses"
+#~ msgstr "Enderezos web"
+
+#~ msgid "Could not open destination"
+#~ msgstr "Non foi posíbel abrir o destino"
+
+#~ msgid "Cannot create object"
+#~ msgstr "Non é posíbel crear o obxecto"
+
+#~ msgid "Could not open source"
+#~ msgstr "Non foi posíbel abrir a fonte"
+
+#~ msgid "The event could not be deleted due to a dbus error: %s"
+#~ msgstr "Non foi posíbel eliminar a actividade debido a un erro dbus: %s"
+
+#~ msgid "The task could not be deleted due to a dbus error: %s"
+#~ msgstr "Non foi posíbel eliminar a tarefa debido a un erro dbus: %s"
+
+#~ msgid "The memo could not be deleted due to a dbus error: %s"
+#~ msgstr "Non foi posíbel eliminar a nota debido a un erro dbus: %s"
+
+#~ msgid "The item could not be deleted due to a dbus error: %s"
+#~ msgstr "Non foi posíbel eliminar o elemento debido a un erro dbus: %s"
+
+#~ msgid "The event could not be deleted because permission was denied"
+#~ msgstr "Non foi posíbel eliminar a actividade porque se denegou o permiso"
+
+#~ msgid "The task could not be deleted because permission was denied"
+#~ msgstr "Non foi posíbel eliminar a tarefa porque se denegou o permiso"
+
+#~ msgid "The memo could not be deleted because permission was denied"
+#~ msgstr "Non foi posíbel eliminar a nota porque se denegou o permiso"
+
+#~ msgid "The item could not be deleted because permission was denied"
+#~ msgstr "Non foi posíbel eliminar o elemento porque se denegou o permiso"
+
+#~ msgid "The event could not be deleted due to an error: %s"
+#~ msgstr "Non foi posíbel eliminar a actividade debido a un erro: %s"
+
+#~ msgid "The task could not be deleted due to an error: %s"
+#~ msgstr "Non foi posíbel eliminar a tarefa debido a un erro: %s"
+
+#~ msgid "The memo could not be deleted due to an error: %s"
+#~ msgstr "Non foi posíbel eliminar a nota debido a un erro: %s"
+
+#~ msgid "The item could not be deleted due to an error: %s"
+#~ msgstr "Non foi posíbel eliminar o elemento debido a un erro: %s"
+
+#~ msgid "Customize"
+#~ msgstr "Personalizar"
+
+#~ msgid "Custom Reminder:"
+#~ msgstr "Recordatorio personalizado:"
+
+#~ msgid "Deleting selected objects"
+#~ msgstr "Eliminando os obxectos seleccionados"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Mensaxe sen título"
+
+#~ msgid "Spell checking color"
+#~ msgstr "Cor da comprobación ortográfica"
+
+#~ msgid "Underline color for misspelled words when using inline spelling."
+#~ msgstr ""
+#~ "Cor de subliñado para as palabras escritas incorrectamente cando se usa a "
+#~ "corrección ortográfica en liña."
+
+#~ msgid "Option is ignored if a match for custom junk headers is found."
+#~ msgstr ""
+#~ "Ignorarase a opción se se atopa algunha coincidencia para as cabeceiras "
+#~ "personalizadas do correo lixo."
+
+#~ msgid "Expunging"
+#~ msgstr "Compactando"
+
+#~ msgid "View image attachments directly in mail messages."
+#~ msgstr "Mostrar as imaxes anexadas directamente nas mensaxes de correo."
+
+#~ msgid ""
+#~ "Issued to:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Emitido a:\n"
+#~ "  Titular: %s\n"
+
+#~ msgid ""
+#~ "Issued by:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Emitido por:\n"
+#~ "  Titular: %s\n"
+
+#~ msgid "Certificate details"
+#~ msgstr "Información do certificado"
+
 #~ msgid "Add"
 #~ msgstr "Engadir"
 
@@ -21991,9 +24200,6 @@ msgstr "Con e_stado"
 #~ msgid "Define Views"
 #~ msgstr "Definir as vistas"
 
-#~ msgid "Table"
-#~ msgstr "Táboa"
-
 #~ msgid "Define New View"
 #~ msgstr "Definir unha vista nova"
 
@@ -22044,9 +24250,6 @@ msgstr "Con e_stado"
 #~ "«sempre» - pechar sempre a xanela do buscador ou «preguntar» (ou calquera "
 #~ "valor) preguntar ao usuario."
 
-#~ msgid "Please select a folder"
-#~ msgstr "Seleccionar un cartafol"
-
 #~ msgid "_Switch to Folder"
 #~ msgstr "_Cambiar ao cartafol"
 
@@ -22284,9 +24487,6 @@ msgstr "Con e_stado"
 #~ msgid "Loading memo list"
 #~ msgstr "Cargando a lista de notas"
 
-#~ msgid "Loading task list"
-#~ msgstr "Cargando lista de tarefas"
-
 #~ msgid "The Evolution tasks have quit unexpectedly."
 #~ msgstr "As tarefas do Evolution saíron inesperadamente."
 
@@ -22367,9 +24567,6 @@ msgstr "Con e_stado"
 #~ msgid "No authoritative name server for '%s'"
 #~ msgstr "Non hai ningún servidor autoritativo para «%s»"
 
-#~ msgid "Unable to create local mail folders at '%s': %s"
-#~ msgstr "Non é posíbel crear os cartafoles de correo local en «%s»: %s"
-
 #~ msgid "Cannot open source \"{1}\"."
 #~ msgstr "Non é posíbel abrir a fonte «{1}»."
 
@@ -22451,9 +24648,6 @@ msgstr "Con e_stado"
 #~ msgid "Lo_gin:"
 #~ msgstr "_Iniciar a sesión:"
 
-#~ msgid "Search _base:"
-#~ msgstr "_Base de busca:"
-
 #~ msgid "_Search scope:"
 #~ msgstr "Ámbito da bu_sca:"
 
@@ -22473,9 +24667,6 @@ msgstr "Con e_stado"
 #~ "Filtro de busca é o tipo de obxecto que buscar. Se isto non se modifica, "
 #~ "a busca predeterminada realizarase no tipo «persoa»."
 
-#~ msgid "1"
-#~ msgstr "1"
-
 #~ msgid "5"
 #~ msgstr "5"
 
@@ -22611,9 +24802,6 @@ msgstr "Con e_stado"
 #~ msgid "CalDAV"
 #~ msgstr "CalDAV"
 
-#~ msgid "Google"
-#~ msgstr "Google"
-
 #~ msgid "Always (SSL)"
 #~ msgstr "Sempre (SSL)"
 
@@ -22700,9 +24888,6 @@ msgstr "Con e_stado"
 #~ msgid "Back - Receiving mail"
 #~ msgstr "Anterior - Recepción do correo"
 
-#~ msgid "Sending mail"
-#~ msgstr "Envío do correo"
-
 #~ msgid "Next - Review account"
 #~ msgstr "Seguinte - Revisar a conta"
 
@@ -22778,18 +24963,6 @@ msgstr "Con e_stado"
 #~ msgid "Settings"
 #~ msgstr "Axustes"
 
-#~ msgid "Undo the last action"
-#~ msgstr "Desfacer a última acción"
-
-#~ msgid "Redo the last undone action"
-#~ msgstr "Refacer a última acción desfeita"
-
-#~ msgid "Search for text"
-#~ msgstr "Busca de texto"
-
-#~ msgid "Search for and replace text"
-#~ msgstr "Buscar e substituír un texto"
-
 #~ msgid "Cannot get transport for account '%s'"
 #~ msgstr "Non é posíbel obter o servizo de transporte para a conta «%s»"
 
@@ -23553,9 +25726,6 @@ msgstr "Con e_stado"
 #~ "Ficheiro de son que desexa reproducir cando chegue unha mensaxe nova, se "
 #~ "non está no modo de ton de aviso."
 
-#~ msgid "Create an _Event"
-#~ msgstr "Cr_ear unha actividade"
-
 #~ msgid ""
 #~ "List of paths for the folders to be synchronized to disk for offline usage"
 #~ msgstr ""
@@ -24084,18 +26254,12 @@ msgstr "Con e_stado"
 #~ msgid "User e_mail:"
 #~ msgstr "Corro-_e do usuario:"
 
-#~ msgid "Failed to create thread: %s"
-#~ msgstr "Produciuse un fallo ao crear a conversa: %s"
-
 #~ msgid "Server URL '%s' is not a valid URL"
 #~ msgstr "O URL do servidor «%s» non é un URL correcto"
 
 #~ msgid "Browse for a CalDAV calendar"
 #~ msgstr "Buscar un calendario CalDAV"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
 #~ msgid "Brows_e server for a calendar"
 #~ msgstr "Busca un cal_endario no servidor"
 
@@ -24108,9 +26272,6 @@ msgstr "Con e_stado"
 #~ msgid "Add CalDAV support to Evolution."
 #~ msgstr "Engadir a compatibilidade de CalDAV con Evolution."
 
-#~ msgid "C_ustomize options"
-#~ msgstr "Opcións de personali_zación"
-
 #~ msgid "On open"
 #~ msgstr "Ao abrir"
 
@@ -24200,9 +26361,6 @@ msgstr "Con e_stado"
 #~ msgid "Cal_endar:"
 #~ msgstr "Cal_endario:"
 
-#~ msgid "Retrieve _List"
-#~ msgstr "Obter a _lista"
-
 #~ msgid "Google Calendars"
 #~ msgstr "Calendarios de Google"
 
@@ -24304,15 +26462,9 @@ msgstr "Con e_stado"
 #~ "procesamento demora demasiado. Pode visualizalo sen formato ou ben con un "
 #~ "editor de texto externo."
 
-#~ msgid "View _Unformatted"
-#~ msgstr "Visualizar sen _formato"
-
 #~ msgid "Hide _Unformatted"
 #~ msgstr "Oc_ultar sen formato"
 
-#~ msgid "O_pen With"
-#~ msgstr "A_brir con"
-
 #~ msgctxt "Button"
 #~ msgid "Attachment"
 #~ msgstr "Anexo"
@@ -24332,9 +26484,6 @@ msgstr "Con e_stado"
 #~ msgid "File _name:"
 #~ msgstr "Nome do f_icheiro:"
 
-#~ msgid "_Filename:"
-#~ msgstr "Nome do _ficheiro:"
-
 #~ msgid "never"
 #~ msgstr "nunca"
 
@@ -24451,9 +26600,6 @@ msgstr "Con e_stado"
 #~ msgid "Evolution _FAQ"
 #~ msgstr "_FAQ do Evolution"
 
-#~ msgid "Insert Send options"
-#~ msgstr "Introducir opcións de envío"
-
 #~ msgid "_Alarms"
 #~ msgstr "_Alarmas"
 
@@ -24729,9 +26875,6 @@ msgstr "Con e_stado"
 #~ msgid "Opening the calendar. Please wait.."
 #~ msgstr "Abrindo o calendario. Agarde..."
 
-#~ msgid "Filter junk messages using SpamAssassin."
-#~ msgstr "Filtra os correos non desexados usando o SpamAssassin."
-
 #~ msgid "Open with \"%s\""
 #~ msgstr "Abrir con \"%s\""
 
@@ -24767,9 +26910,6 @@ msgstr "Con e_stado"
 #~ msgstr ""
 #~ "Produciuse un fallo na canalización co SpamAssassin; código de erro: %d"
 
-#~ msgid "Creating folder '%s'"
-#~ msgstr "Creando o cartafol «%s»"
-
 #~ msgctxt "iCalImp"
 #~ msgid "has alarms"
 #~ msgstr "ten alarmas"
@@ -24821,9 +26961,6 @@ msgstr "Con e_stado"
 #~ msgid "Retrieving quota information for folder '%s'"
 #~ msgstr "Obtendo a información da cota do cartafol «%s»"
 
-#~ msgid "Opening store '%s'"
-#~ msgstr "Abrindo o almacenamento «%s»"
-
 #~ msgid "Checking Service"
 #~ msgstr "Comprobando o servizo"
 



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