[evolution] Updated Galician translations



commit 70cc1adcde00c466b4c224f4b269dcf61ce3b49e
Author: Fran Dieguez <fran dieguez mabishu com>
Date:   Wed Feb 24 22:07:26 2016 +0100

    Updated Galician translations

 po/gl.po | 7857 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 4327 insertions(+), 3530 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index b0c2552..7ddd33c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,14 +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, 2015.
+# Fran Dieguez <frandieguez gnome org>, 2012, 2013, 2014, 2015, 2016.
 #: ../shell/main.c:522
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-14 17:03+0200\n"
-"PO-Revision-Date: 2015-09-14 17:12+0200\n"
+"POT-Creation-Date: 2016-02-24 21:43+0100\n"
+"PO-Revision-Date: 2016-02-24 22:07+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: gnome-l10n-gl gnome org\n"
 "Language: gl\n"
@@ -98,7 +98,7 @@ msgid "This address book will be removed permanently."
 msgstr "Esta axenda de enderezos retirarase permanentemente."
 
 #: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Do _Not Delete"
 msgstr "_Non eliminar"
 
@@ -115,7 +115,7 @@ msgstr ""
 "certeza de querer continuar?"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "_Delete From Server"
 msgstr "_Eliminar do servidor"
 
@@ -201,16 +201,13 @@ msgstr ""
 #: ../addressbook/addressbook.error.xml.h:34
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 #: ../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
+#: ../calendar/gui/e-comp-editor-page-general.c:1357
 #: ../e-util/e-mail-signature-manager.c:327
 #: ../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:57 ../modules/mail/em-composer-prefs.c:417
-#: ../plugins/attachment-reminder/attachment-reminder.c:438
+#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:417
+#: ../plugins/attachment-reminder/attachment-reminder.c:457
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
@@ -250,7 +247,7 @@ msgstr ""
 "engadila de todas as formas?"
 
 #: ../addressbook/addressbook.error.xml.h:41
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1252
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 msgid "Failed to delete contact"
 msgstr "Produciuse un erro ao eliminar o contacto"
 
@@ -311,9 +308,6 @@ msgid "_Where:"
 msgstr "_Onde:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-#: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías…"
 
@@ -345,7 +339,7 @@ msgid "Instant Messaging"
 msgstr "Mensaxaría instantánea"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:971
+#: ../addressbook/importers/evolution-vcard-importer.c:979
 msgid "Contact"
 msgstr "Contacto"
 
@@ -354,8 +348,7 @@ msgid "_Home Page:"
 msgstr "Páxi_na web:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../calendar/gui/e-comp-editor-event.c:631
 #: ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "_Calendario:"
@@ -373,7 +366,7 @@ msgid "Home Page:"
 msgstr "Páxina web:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:92
+#: ../modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "_Calendario:"
 
@@ -446,18 +439,19 @@ msgstr "_Aniversario:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../calendar/gui/e-calendar-view.c:2049
+#: ../calendar/gui/e-calendar-view.c:2037
 msgid "Anniversary"
 msgstr "Aniversario"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../calendar/gui/e-calendar-view.c:2048
+#: ../calendar/gui/e-calendar-view.c:2036
 msgid "Birthday"
 msgstr "Aniversario"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "Varios"
 
@@ -509,7 +503,7 @@ msgstr "Traballo"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:83
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:512
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:909
-#: ../calendar/gui/e-cal-model.c:3791
+#: ../calendar/gui/e-cal-model.c:3825
 msgid "Other"
 msgstr "Outros"
 
@@ -518,6 +512,8 @@ msgid "Mailing Address"
 msgstr "Enderezo de correo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
 msgid "Notes"
 msgstr "Notas"
 
@@ -531,15 +527,14 @@ msgstr "Engadir _X.509"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:475
-#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
-#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
-#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
-#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:58
-#: ../plugins/attachment-reminder/attachment-reminder.c:448
+#: ../calendar/gui/e-comp-editor-page-general.c:1373
+#: ../e-util/e-attachment-view.c:475 ../e-util/e-filter-rule.c:225
+#: ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.error.xml.h:18
+#: ../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:59
+#: ../plugins/attachment-reminder/attachment-reminder.c:467
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:791
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
@@ -559,11 +554,10 @@ msgstr "_Cargar X.509"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47
-#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2103
 #: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
-#: ../e-util/e-attachment-store.c:636
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3230
+#: ../e-util/e-attachment-store.c:641
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3318
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
 #: ../smime/gui/certificate-manager.c:655
@@ -577,16 +571,16 @@ msgid "Certificates"
 msgstr "Certificados"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/dialogs/comp-editor.c:1277
-#: ../calendar/gui/dialogs/comp-editor.c:1363
-#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
+#: ../calendar/gui/e-comp-editor.c:2000 ../calendar/gui/e-comp-editor.c:2072
+#: ../e-util/e-preferences-window.c:382 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell.c:1215 ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell.c:1223 ../shell/e-shell-window-actions.c:955
 msgid "_Help"
 msgstr "A_xuda"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1997
+#: ../mail/mail-config.ui.h:37
 msgid "Options"
 msgstr "Opcións"
 
@@ -603,15 +597,12 @@ msgstr "Opcións"
 #: ../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:1332
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
-#: ../calendar/gui/dialogs/recurrence-page.c:2326
-#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:340
-#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
-#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:421
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1365
+#: ../calendar/gui/e-cal-dialogs.c:689
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:359
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:496
+#: ../e-util/e-attachment-store.c:640 ../e-util/e-attachment-view.c:421
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
@@ -619,15 +610,15 @@ msgstr "Opcións"
 #: ../e-util/e-image-chooser-dialog.c:171
 #: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
-#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
+#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:791
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3229
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3317
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
-#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:18
+#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:16
 #: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
 #: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
 #: ../modules/backup-restore/evolution-backup-tool.c:899
@@ -691,24 +682,22 @@ msgid "Show Certificates"
 msgstr "Mostrar certificados"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/dialogs/comp-editor.c:1326
-#: ../e-util/e-html-editor-actions.c:1111
+#: ../calendar/gui/e-comp-editor.c:2035 ../e-util/e-html-editor-actions.c:1111
 msgid "_Undo"
 msgstr "_Desfacer"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/dialogs/comp-editor.c:1328 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2037 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Desfacer"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/dialogs/comp-editor.c:1333
-#: ../e-util/e-html-editor-actions.c:1097
+#: ../calendar/gui/e-comp-editor.c:2042 ../e-util/e-html-editor-actions.c:1097
 msgid "_Redo"
 msgstr "_Refacer"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1335 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2044 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Refacer"
 
@@ -755,7 +744,7 @@ msgstr "Abir certificado X.509"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
-#: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
+#: ../e-util/e-attachment-store.c:494 ../e-util/e-category-editor.c:146
 #: ../e-util/e-html-editor-actions.c:594 ../e-util/e-html-editor-actions.c:689
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
 #: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
@@ -840,16 +829,13 @@ msgstr "Contacto incorrecto."
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-#: ../calendar/gui/dialogs/recurrence-page.c:2327
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
 #: ../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:436 ../e-util/e-passwords.c:471
 #: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
-#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
+#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:792
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
 #: ../e-util/e-source-selector-dialog.c:373 ../e-util/e-table-config.c:549
 #: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
@@ -860,7 +846,7 @@ msgstr "Contacto incorrecto."
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:184 ../smime/gui/certificate-manager.c:1338
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1338
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_Aceptar"
@@ -999,12 +985,12 @@ msgid "_Top"
 msgstr "_Inicio"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
-#: ../e-util/filter.ui.h:20
+#: ../e-util/e-source-selector.c:3471 ../e-util/filter.ui.h:20
 msgid "_Up"
 msgstr "_Arriba"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../e-util/filter.ui.h:21
+#: ../e-util/e-source-selector.c:3472 ../e-util/filter.ui.h:21
 msgid "_Down"
 msgstr "A_baixo"
 
@@ -1034,22 +1020,22 @@ msgid "Error removing list"
 msgstr "Produciuse un erro ao retirar a lista"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Name contains"
 msgstr "O nome contén"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1188
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 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:1181
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:985
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
@@ -1064,22 +1050,22 @@ msgid "Copy _Email Address"
 msgstr "Copiar o _enderezo de correo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:338
+#: ../e-util/e-web-view.c:340
 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:350
+#: ../e-util/e-web-view.c:352
 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:352
+#: ../e-util/e-web-view.c:354
 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:1064
+#: ../e-util/e-web-view.c:1069
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
@@ -1175,15 +1161,13 @@ 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:572
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
+#: ../modules/calendar/e-cal-shell-view.c:579
 #: ../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"
@@ -1436,60 +1420,60 @@ msgstr "Busca interrumpida"
 msgid "Error modifying card"
 msgstr "Produciuse un erro ao modificar a tarxeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:649
+#: ../addressbook/gui/widgets/e-addressbook-view.c:682
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cortar os contactos seleccionados ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../addressbook/gui/widgets/e-addressbook-view.c:688
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copiar os contactos seleccionados ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:661
+#: ../addressbook/gui/widgets/e-addressbook-view.c:694
 msgid "Paste contacts from the clipboard"
 msgstr "Pegar os contactos desde o portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:667
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../addressbook/gui/widgets/e-addressbook-view.c:700
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
 msgid "Delete selected contacts"
 msgstr "Eliminar os contactos seleccionados"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:673
+#: ../addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Select all visible contacts"
 msgstr "Seleccionar todos os contactos visíbeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Está seguro de que desexa eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1337
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Está seguro de que desexa eliminar esta lista de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1341
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Está seguro de que desexa eliminar esta lista de contactos (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1347
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Está seguro de que desexa eliminar estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
 msgid "Are you sure you want to delete this contact?"
 msgstr "Está seguro de que desexa eliminar este contacto?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1355
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Está seguro de que desexa eliminar este contacto (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../e-util/e-focus-tracker.c:785
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1366
+#: ../calendar/gui/e-comp-editor.c:1993 ../e-util/e-focus-tracker.c:785
 #: ../e-util/evolution-source-viewer.c:805 ../mail/e-mail-account-manager.c:736
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/addressbook/e-book-shell-view-actions.c:1089
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:832
 #: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:813
 #: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
@@ -1497,7 +1481,7 @@ msgid "_Delete"
 msgstr "E_liminar"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1480
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1512,11 +1496,11 @@ msgstr[1] ""
 "Ao abrir %d contactos, abrirá tamén %d novas xanelas.\n"
 "Está seguro de que desexa visualizar todos estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1521
 msgid "_Don't Display"
 msgstr "_Non mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1489
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1522
 msgid "Display _All Contacts"
 msgstr "Mostrar _todos os contactos"
 
@@ -1627,7 +1611,7 @@ msgid "Title"
 msgstr "Título"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:684
+#: ../calendar/gui/e-meeting-list-view.c:659
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Función"
@@ -1641,10 +1625,9 @@ msgid "Journal"
 msgstr "Xornal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-task-table.etspec.h:12 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "Categorías"
 
@@ -1690,13 +1673,13 @@ msgstr "_Ampliar"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2385
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2090
+#: ../e-util/e-html-editor-actions.c:2106
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
@@ -1763,49 +1746,49 @@ msgstr ""
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:430
-#: ../calendar/importers/icalendar-importer.c:925
-#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:485
+#: ../calendar/importers/icalendar-importer.c:980
+#: ../calendar/importers/icalendar-importer.c:1019 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Importando…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
+#: ../addressbook/importers/evolution-csv-importer.c:1089
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab de contactos de Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Importador de CSV e Tab de contactos de Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab de contactos de Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Importador de CSV e Tab de contactos de Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab de contactos de Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Importador de CSV e Tab de contactos de Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:814
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:815
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:634
+#: ../addressbook/importers/evolution-vcard-importer.c:642
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:635
+#: ../addressbook/importers/evolution-vcard-importer.c:643
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard do Evolution"
 
@@ -1991,11 +1974,7 @@ msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
-#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:131
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
@@ -2006,7 +1985,7 @@ msgid "Start time"
 msgstr "Hora de inicio"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1924
+#: ../calendar/alarm-notify/alarm-queue.c:1949
 msgid "Appointments"
 msgstr "Citas"
 
@@ -2019,16 +1998,13 @@ msgid "_Snooze"
 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:1349
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#: ../calendar/gui/dialogs/task-page.ui.h:32
-#: ../e-util/e-html-editor-actions.c:1120
+#: ../calendar/gui/e-comp-editor-page-general.c:1365
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2240
+#: ../calendar/gui/e-comp-editor.c:2058 ../e-util/e-html-editor-actions.c:1120
 #: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
-#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:171
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:62
-#: ../plugins/attachment-reminder/attachment-reminder.c:443
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:173
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
+#: ../plugins/attachment-reminder/attachment-reminder.c:462
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:941
@@ -2045,8 +2021,8 @@ msgid "_Dismiss"
 msgstr "_Ignorar"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1888
-#: ../calendar/alarm-notify/alarm-queue.c:1898
+#: ../calendar/alarm-notify/alarm-queue.c:1916
+#: ../calendar/alarm-notify/alarm-queue.c:1926
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
 #: ../modules/itip-formatter/itip-view.c:1514
 #: ../modules/itip-formatter/itip-view.c:1625
@@ -2064,30 +2040,25 @@ 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/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:326
+#: ../modules/calendar/e-cal-shell-view-actions.c:344
 #: ../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/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/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:1714
-#: ../calendar/alarm-notify/alarm-queue.c:1868
+#: ../calendar/alarm-notify/alarm-queue.c:1896
 msgid "No summary available."
 msgstr "Non hai un resumo dispoñíbel."
 
@@ -2101,8 +2072,8 @@ msgid "No location information available."
 msgstr "Non hai información da localización dispoñíbel."
 
 #: ../calendar/alarm-notify/alarm-queue.c:1738
-#: ../calendar/alarm-notify/alarm-queue.c:1859
-#: ../calendar/alarm-notify/alarm-queue.c:2214
+#: ../calendar/alarm-notify/alarm-queue.c:1887
+#: ../calendar/alarm-notify/alarm-queue.c:2240
 msgid "Evolution Reminders"
 msgstr "Recordatorios de Evolution"
 
@@ -2113,21 +2084,21 @@ msgid_plural "You have %d reminders"
 msgstr[0] "Ten %d recordatorio"
 msgstr[1] "Ten %d recordatorios"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2032
+#: ../calendar/alarm-notify/alarm-queue.c:2058
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2033 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Non"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2034
+#: ../calendar/alarm-notify/alarm-queue.c:2060
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Si"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2038
+#: ../calendar/alarm-notify/alarm-queue.c:2064
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2144,7 +2115,7 @@ msgstr ""
 "\n"
 "Está seguro de que desexa executar este programa?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2053
+#: ../calendar/alarm-notify/alarm-queue.c:2079
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
@@ -2152,7 +2123,7 @@ msgstr "Non volver preguntar sobre este programa."
 msgid "invalid time"
 msgstr "hora incorrecta"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d hours before start"
 #: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
@@ -2161,7 +2132,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d minutes before start"
 #: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
@@ -2171,7 +2142,7 @@ msgstr[0] "%d minuto"
 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"
+#. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. 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:394
 #: ../calendar/gui/misc.c:113
@@ -2202,7 +2173,7 @@ msgstr "_Non enviar"
 msgid "_Send Notice"
 msgstr "_Enviar a notificación"
 
-#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/e-cal-dialogs.c:502
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Está seguro de que desexa eliminar esta reunión?"
@@ -2222,7 +2193,7 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que se eliminou a tarefa."
 
-#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/e-cal-dialogs.c:505
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Está seguro de que desexa eliminar esta tarefa?"
@@ -2245,8 +2216,7 @@ msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
 "quizais non saiban que se eliminou a nota."
 
-#: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:198
+#: ../calendar/calendar.error.xml.h:13 ../calendar/gui/e-cal-dialogs.c:508
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Está seguro de que desexa eliminar esta nota?"
@@ -2334,7 +2304,7 @@ msgstr "Modificou esta reunión pero aínda non a gardou."
 msgid "_Save Changes"
 msgstr "_Gardar as modificacións"
 
-#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "_Rexeitar as modificacións"
 
@@ -2373,7 +2343,7 @@ msgstr ""
 "Enviaranse convites por correo electrónico a todos os participantes e "
 "permitiráselles responder."
 
-#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:36
 #: ../mail/mail.error.xml.h:8
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
@@ -2440,38 +2410,63 @@ msgstr ""
 "a súa lista de tarefas ao día."
 
 #: ../calendar/calendar.error.xml.h:52
+msgid "Would you like to send this memo to participants?"
+msgstr "Desexa enviar esta recordatorio aos participantes?"
+
+#: ../calendar/calendar.error.xml.h:53
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this memo."
+msgstr ""
+"Enviaranse convites por correo electrónico a todos os participantes e "
+"permitiráselles aceptar este recordatorio."
+
+#: ../calendar/calendar.error.xml.h:54
+msgid "Would you like to send updated memo information to participants?"
+msgstr ""
+"Desexa enviar información actualizada do recordatorio aos participantes?"
+
+#: ../calendar/calendar.error.xml.h:55
+msgid ""
+"Sending updated information allows other participants to keep their memo "
+"lists up to date."
+msgstr ""
+"Ao enviar información actualizada permite que outros participantes manteñan "
+"a súa lista de recordatorios ao día."
+
+#: ../calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "Non foi posíbel cargar o editor."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "Delete calendar '{0}'?"
 msgstr "Desexa eliminar o calendario «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Este calendario retirarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "Delete task list '{0}'?"
 msgstr "Desexa eliminar a lista de tarefas «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas retirarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "Delete memo list '{0}'?"
-msgstr "Desexa eliminar a lista de notas «{0}»?"
+msgstr "Desexa eliminar a lista de recordatorios «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
-msgstr "Esta lista de notas retirarase permanentemente."
+msgstr "Esta lista de recordatorios retirarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Delete remote calendar '{0}'?"
 msgstr "Desexa eliminar o calendario remoto «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "This will permanently remove the calendar '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2479,11 +2474,11 @@ msgstr ""
 "Isto retirará permanentemente o calendario «{0}» do servidor. Ten certeza de "
 "querer continuar?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Delete remote task list '{0}'?"
 msgstr "Desexa eliminar a lista de tarefas remota «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid ""
 "This will permanently remove the task list '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2491,11 +2486,11 @@ msgstr ""
 "Isto retirará permanentemente a lista de tarefas remota «{0}» do servidor. "
 "Ten certeza de querer continuar?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Delete remote memo list '{0}'?"
 msgstr "Desexa eliminar a lista de recordatorios remota «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid ""
 "This will permanently remove the memo list '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2503,11 +2498,11 @@ msgstr ""
 "Isto retirará permanentemente a lista de recordatorios remota «{0}» do "
 "servidor. Ten certeza de querer continuar?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Está seguro de que desexa gardar a cita sen un resumo?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2515,11 +2510,11 @@ msgstr ""
 "Engadir un resumo significativo á súa cita daralle unha idea sobre o contido "
 "desta."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "Está seguro de que desexa gardar a tarefa sen un resumo?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2527,25 +2522,25 @@ msgstr ""
 "Engadir un resumo significativo á súa tarefa daralle unha idea sobre o "
 "contido desta."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Está seguro que desexa gardar a nota sen un resumo?"
+msgstr "Está seguro que desexa gardar o recordatorio sen un resumo?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Error loading calendar '{0}'"
 msgstr "Produciuse un erro ao cargar o calendario «{0}»"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "The calendar is not marked for offline usage."
 msgstr "O calendario non está marcado para o seu uso sen conexión."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Cannot save event"
 msgstr "Non é posíbel gardar a actividade"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:80
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -2553,12 +2548,12 @@ msgstr ""
 "«{0}» é un calendario só de lectura e non é posíbel modificalo. Seleccione "
 "un calendario diferente que poida aceptar citas."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
 msgstr "Non é posíbel gardar a tarefa"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
 msgstr ""
@@ -2566,224 +2561,253 @@ msgstr ""
 "diferentes."
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:85
 msgid "Error loading task list '{0}'"
 msgstr "Produciuse un erro ao cargar a lista de tarefas «{0}»"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:86
 msgid "The task list is not marked for offline usage."
 msgstr "A lista de tarefas non está marcada para o seu uso sen conexión."
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:88
 msgid "Error loading memo list '{0}'"
 msgstr "Produciuse un erro ao cargar a lista de recordatorios «{0}»"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:89
 msgid "The memo list is not marked for offline usage."
-msgstr "A lista de notas non está marcada para o seu uso sen conexión."
+msgstr "A lista de recordatorios non está marcada para o seu uso sen conexión."
+
+#. Translators: {0} is the name of the calendar/memo list/task list.
+#: ../calendar/calendar.error.xml.h:91
+#, fuzzy
+msgid "Failed to add timezone to '{0}'"
+msgstr "Produciuse un fallo ao conectarse «{0}»"
+
+#. The {0} is a calendar/memo list/task list name, which is useless here
+#: ../calendar/calendar.error.xml.h:93
+#, fuzzy
+msgid "Failed to save attachments"
+msgstr "Non foi posíbel gardar os anexos"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:95
 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
+#: ../calendar/calendar.error.xml.h:97
 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
+#: ../calendar/calendar.error.xml.h:99
 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
+#: ../calendar/calendar.error.xml.h:101
 msgid "Failed to create an event in the calendar '{0}'"
 msgstr "Produciuse un crear un evento no calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:103
 msgid "Failed to create a memo in the memo list '{0}'"
 msgstr ""
 "Produciuse un fallo ao crear un recordatorio na lista de recordatorios «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:105
 msgid "Failed to create a task in the task list '{0}'"
 msgstr "Produciuse un fallo ao crear unha tarefa na lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:107
 msgid "Failed to modify an event in the calendar '{0}'"
 msgstr "Produciuse un fallo ao modificar un evento no calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:109
 msgid "Failed to modify a memo in the memo list '{0}'"
 msgstr ""
 "Produciuse un fallo ao modificar un recordatorio na lista de recordatorios "
 "«{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:111
 msgid "Failed to modify a task in the task list '{0}'"
 msgstr "Produciuse un fallo ao modificar unha tarefa na lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:113
 msgid "Failed to delete an event in the calendar '{0}'"
 msgstr "Produciuse un fallo ao eliminar un evento o calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:115
 msgid "Failed to delete a memo in the memo list '{0}'"
 msgstr ""
 "Produciuse un fallo ao eliminar unha recordatorio na lista de recordatorios "
 "«{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:117
 msgid "Failed to delete a task in the task list '{0}'"
 msgstr "Produciuse un fallo ao eliminar unha tarefa da lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:111
+#: ../calendar/calendar.error.xml.h:119
 msgid "Failed to update an event in the calendar '{0}'"
 msgstr "Produciuse un fallo ao actualizar un evento o calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:113
+#: ../calendar/calendar.error.xml.h:121
 msgid "Failed to update a memo in the memo list '{0}'"
 msgstr ""
 "Produciuse un fallo ao actualizar un recordatorio na lista de recordatorios "
 "«{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:115
+#: ../calendar/calendar.error.xml.h:123
 msgid "Failed to update a task in the task list '{0}'"
 msgstr ""
 "Produciuse un fallo ao actualizar unha tarefa na lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:117
+#: ../calendar/calendar.error.xml.h:125
 msgid "Failed to send an event to the calendar '{0}'"
 msgstr "Produciuse un fallo ao enviar un evento ao calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:119
+#: ../calendar/calendar.error.xml.h:127
 msgid "Failed to send a memo to the memo list '{0}'"
 msgstr ""
 "Produciuse un fallo ao enviar un recordatorio na lista de recordatorios «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:121
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to send a task to the task list '{0}'"
 msgstr "Produciuse un fallo ao enviar unha tarefa na lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:123
+#: ../calendar/calendar.error.xml.h:131
 msgid "Error creating view for the calendar '{0}'"
 msgstr "Produciuse un erro ao crear unha vista para o calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:125
+#: ../calendar/calendar.error.xml.h:133
 msgid "Error creating view for the task list '{0}'"
 msgstr "Produciuse un erro ao crear unha vista para a lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:127
+#: ../calendar/calendar.error.xml.h:135
 msgid "Error creating view for the memo list '{0}'"
 msgstr ""
 "Produciuse un erro ao crear unha vista para a lista de recordatorios «{0}»"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:129
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "Produciuse un fallo ao copiar un evento no calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:131
+#: ../calendar/calendar.error.xml.h:139
 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:133
+#: ../calendar/calendar.error.xml.h:141
 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:135
+#: ../calendar/calendar.error.xml.h:143
 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:137
+#: ../calendar/calendar.error.xml.h:145
 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:139
+#: ../calendar/calendar.error.xml.h:147
 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:141
+#: ../calendar/calendar.error.xml.h:149
+msgid "Failed to get an event from the calendar '{0}'"
+msgstr "Produciuse un fallo ao enviar un evento desde o calendario «{0}»"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:151
+msgid "Failed to get a task from the task list '{0}'"
+msgstr "Produciuse un fallo ao obter unha tarefa na lista de tarefas «{0}»"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:153
+msgid "Failed to get a memo from the memo list '{0}'"
+msgstr ""
+"Produciuse un fallo ao obter un recordatorio desde a lista de recordatorios "
+"«{0}»"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:155
 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:143
+#: ../calendar/calendar.error.xml.h:157
 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:145
+#: ../calendar/calendar.error.xml.h:159
 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:147
+#: ../calendar/calendar.error.xml.h:161
 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:149
+#: ../calendar/calendar.error.xml.h:163
 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:151
+#: ../calendar/calendar.error.xml.h:165
 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
+#: ../calendar/calendar.error.xml.h:167
 msgid "Failed to refresh calendar '{0}'"
 msgstr "Produciuse un fallo ao actualizar o calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:155
+#: ../calendar/calendar.error.xml.h:169
 msgid "Failed to refresh task list '{0}'"
 msgstr "Produciuse un fallo ao actualizar a lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:157
+#: ../calendar/calendar.error.xml.h:171
 msgid "Failed to refresh memo list '{0}'"
 msgstr "Produciuse un fallo ao actualizar a lista de recordatorios «{0}»"
 
-#: ../calendar/calendar.error.xml.h:158
+#: ../calendar/calendar.error.xml.h:172
 msgid "Failed to make an occurrence movable"
 msgstr "Produciuse un fallo ao crear unha ocorrencia movíbel"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-table.etspec.h:4
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-task-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
 msgid "Summary"
 msgstr "Resumo"
@@ -2802,7 +2826,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-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Descrición"
@@ -2828,26 +2852,22 @@ msgstr "é"
 msgid "is not"
 msgstr "non é"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:306
-#: ../calendar/gui/e-cal-model.c:313 ../calendar/gui/e-task-table.c:498
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:305 ../calendar/gui/e-cal-model.c:312
+#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Público"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:315
-#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:314 ../calendar/gui/e-task-table.c:499
+#: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Privado"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:317
-#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-html-editor-page-dialog.c:117 ../e-util/e-send-options.ui.h:7
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:316 ../calendar/gui/e-task-table.c:500
+#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:117
+#: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Confidencial"
 
@@ -2876,28 +2896,27 @@ msgid "Category"
 msgstr "Categoría"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:51
 #: ../em-format/e-mail-formatter-print-headers.c:157
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
+#: ../mail/filtertypes.xml.in.h:47 ../mail/searchtypes.xml.in.h:49
+#: ../mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
 msgstr "Anexos"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
-#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:48
+#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Exist"
 msgstr "Existe"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
-#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:49
+#: ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
 msgid "Do Not Exist"
 msgstr "Non existe"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/dialogs/event-editor.c:309
-#: ../calendar/gui/dialogs/event-editor.c:330
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2004
 msgid "Recurrence"
 msgstr "Repetición"
 
@@ -2927,1304 +2946,23 @@ msgstr "O resumo contén"
 msgid "Description Contains"
 msgstr "A descrición contén"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:668
-msgid "Edit Reminder"
-msgstr "Editar recordatorio"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../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:420
-msgid "Play a sound"
-msgstr "Reproducir un son"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../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:428
-msgid "Send an email"
-msgstr "Enviar unha mensaxe de correo-e"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:908
-msgid "before"
-msgstr "é anterior a"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
-msgid "after"
-msgstr "Máis tarde"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:918
-msgid "start of appointment"
-msgstr "inicio da cita"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
-msgid "end of appointment"
-msgstr "fin da cita"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "minute(s)"
-msgstr "minuto(s)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "hour(s)"
-msgstr "hora(s)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "day(s)"
-msgstr "día(s)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Add Reminder"
-msgstr "Engadir recordatorio"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-#: ../calendar/gui/dialogs/event-editor.c:352
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "Repeat"
-msgstr "Repetir"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "_Repetir o recordatorio"
-
-#. This is part of the sentence:
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "extra times every"
-msgstr "veces adicionais cada"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "Custom _message"
-msgstr "_Mensaxe personalizada"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-msgid "Mes_sage:"
-msgstr "Mensa_xe:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "Custom reminder sound"
-msgstr "Son de recordatorio personalizado"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
-msgid "_Sound:"
-msgstr "_Son:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "Select A File"
-msgstr "Seleccionar un ficheiro"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "_Program:"
-msgstr "_Programa:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-msgid "_Arguments:"
-msgstr "_Argumentos:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "Send To:"
-msgstr "Enviar a:"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
-msgid "Action/Trigger"
-msgstr "Acción/Activador"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
-msgid "Reminders"
-msgstr "Recordatorios"
-
-#: ../calendar/gui/dialogs/changed-comp.c:59
-msgid "This event has been deleted."
-msgstr "Esta actividade eliminouse."
-
-#: ../calendar/gui/dialogs/changed-comp.c:63
-msgid "This task has been deleted."
-msgstr "Esta tarefa eliminouse."
-
-#: ../calendar/gui/dialogs/changed-comp.c:67
-msgid "This memo has been deleted."
-msgstr "Esta nota eliminouse."
-
-#: ../calendar/gui/dialogs/changed-comp.c:77
-#, c-format
-msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  Realizou modificacións. Desexa ignorar estas modificacións e pechar o "
-"editor?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:79
-#, c-format
-msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  Non realizou modificacións. Desexa pechar o editor?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:84
-msgid "This event has been changed."
-msgstr "Esta actividade modificouse"
-
-#: ../calendar/gui/dialogs/changed-comp.c:88
-msgid "This task has been changed."
-msgstr "Esta tarefa modificouse."
-
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This memo has been changed."
-msgstr "Esta nota modificouse."
-
-#: ../calendar/gui/dialogs/changed-comp.c:102
-#, c-format
-msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  Realizou modificacións. Desexa ignorar estas modificacións e actualizar "
-"o editor?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:104
-#, c-format
-msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  Non realizou modificacións. Desexa actualizar o editor?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:299
-msgid "Could not save attachments"
-msgstr "Non foi posíbel gardar os anexos"
-
-#: ../calendar/gui/dialogs/comp-editor.c:653
-msgid "Could not update object"
-msgstr "Non foi posíbel actualizar o obxecto"
-
-#: ../calendar/gui/dialogs/comp-editor.c:787
-msgid "Edit Appointment"
-msgstr "Editar a cita"
-
-#: ../calendar/gui/dialogs/comp-editor.c:794
-#, c-format
-msgid "Meeting - %s"
-msgstr "Reunión - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:796
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:802
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tarefa asignada - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:804
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:809
-#, c-format
-msgid "Memo - %s"
-msgstr "Nota - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:825
-msgid "No Summary"
-msgstr "Sen resumo"
-
-#: ../calendar/gui/dialogs/comp-editor.c:946
-msgid "Keep original item?"
-msgstr "Desexa gardar o elemento orixinal?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1109
-#: ../calendar/gui/dialogs/comp-editor.c:1137
-msgid "Unable to synchronize with the server"
-msgstr "Non foi posíbel sincronizar co servidor"
-
-#. == Button box ==
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../calendar/gui/dialogs/event-editor.c:116
-#: ../calendar/gui/dialogs/event-editor.c:310
-#: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:334 ../e-util/e-html-editor-dialog.c:196
-#: ../e-util/e-mail-signature-editor.c:295
-#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:127
-#: ../mail/em-folder-properties.c:688 ../mail/em-subscription-editor.c:1759
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
-#: ../smime/gui/certificate-manager.c:2066
-msgid "_Close"
-msgstr "_Pechar"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1251
-msgid "Close the current window"
-msgstr "Pechar a xanela actual"
-
-#. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
-#: ../e-util/e-web-view.c:377 ../mail/e-mail-browser.c:134
-#: ../mail/mail.error.xml.h:141 ../shell/e-shell-window-actions.c:799
-msgid "_Copy"
-msgstr "_Copiar…"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:175
-#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
-#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:379
-#: ../e-util/e-web-view.c:1415 ../mail/e-mail-browser.c:136
-#: ../shell/e-shell-window-actions.c:801
-msgid "Copy the selection"
-msgstr "Copiar a selección"
-
-#. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1263 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
-#: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:806
-msgid "Cu_t"
-msgstr "Cor_tar"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1265 ../e-util/e-focus-tracker.c:168
-#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1409
-#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:808
-msgid "Cut the selection"
-msgstr "Cortar a selección"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1272 ../e-util/e-focus-tracker.c:189
-#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
-#: ../shell/e-shell-window-actions.c:815
-msgid "Delete the selection"
-msgstr "Eliminar a selección"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1279
-msgid "View help"
-msgstr "Ver a axuda"
-
-#. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
-#: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:834
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1286 ../e-util/e-focus-tracker.c:182
-#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1421
-#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:836
-msgid "Paste the clipboard"
-msgstr "Pegar o contido do portapapeis"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1291
-#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2195
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
-#: ../modules/addressbook/e-book-shell-view-actions.c:1219
-msgid "_Print..."
-msgstr "_Imprimir…"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1298 ../mail/e-mail-reader.c:2202
-#: ../modules/addressbook/e-book-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-actions.c:1642
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:964
-msgid "Pre_view..."
-msgstr "Previsuliazar…"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1307
-msgid "Save current changes"
-msgstr "Gardar os cambios actuais"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1312
-#: ../e-util/e-mail-signature-editor.c:304
-msgid "Save and Close"
-msgstr "Gardar e pechar"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1314
-msgid "Save current changes and close editor"
-msgstr "Gardar os cambios actuais e pechar o editor"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1319 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:387
-#: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:911
-msgid "Select _All"
-msgstr "Seleccionar _todo"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1321 ../e-util/e-focus-tracker.c:196
-#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
-#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:913
-msgid "Select all text"
-msgstr "Seleccionar todo o texto"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1342
-msgid "_Classification"
-msgstr "_Clasificación"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1127
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
-#: ../shell/e-shell-window-actions.c:948
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1370
-#: ../e-util/e-html-editor-actions.c:1148
-msgid "_Insert"
-msgstr "_Inserir"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:378
-msgid "_Options"
-msgstr "_Opcións"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1384
-#: ../e-util/e-html-editor-actions.c:1169 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
-msgid "_View"
-msgstr "_Vista"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1394
-#: ../composer/e-composer-actions.c:327
-msgid "_Attachment..."
-msgstr "_Anexo…"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
-msgid "Attach a file"
-msgstr "Anexar un ficheiro"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1404
-msgid "_Categories"
-msgstr "_Categorías"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1406
-msgid "Toggles whether to display categories"
-msgstr "Alterna a vista das categorías"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1412
-msgid "Time _Zone"
-msgstr "_Fuso horario"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1414
-msgid "Toggles whether the time zone is displayed"
-msgstr "Alterna a vista do fuso horario"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1423
-msgid "Pu_blic"
-msgstr "Pú_blico"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1425
-msgid "Classify as public"
-msgstr "Clasificar como público"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1430
-msgid "_Private"
-msgstr "_Privado"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1432
-msgid "Classify as private"
-msgstr "Clasificar como privado"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1437
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1439
-msgid "Classify as confidential"
-msgstr "Clasificar como confidencial"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1447
-msgid "R_ole Field"
-msgstr "Campo da _función"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1449
-msgid "Toggles whether the Role field is displayed"
-msgstr "Alterna a vista do campo da función"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1455
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1457
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Alterna a vista do campo RSVP"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1463
-msgid "_Status Field"
-msgstr "Campo de e_stado"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1465
-msgid "Toggles whether the Status field is displayed"
-msgstr "Alterna a vista do campo de estado"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1471
-msgid "_Type Field"
-msgstr "Campo do _tipo"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1473
-msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Alterna a vista do campo de tipo de participante"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2596
-#: ../composer/e-composer-actions.c:612
-msgid "Attach"
-msgstr "Anexar"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2926
-#: ../calendar/gui/dialogs/comp-editor.c:3512
-#: ../calendar/gui/dialogs/comp-editor.c:4525
-msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"As modificacións realizadas neste elemento pódense rexeitar se chega unha "
-"actualización"
-
-#: ../calendar/gui/dialogs/comp-editor.c:4487
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
-msgid "attachment"
-msgstr "anexo"
-
-#: ../calendar/gui/dialogs/comp-editor.c:4557
-msgid "Unable to use current version!"
-msgstr "Non é posíbel usar a versión actual!"
-
-#: ../calendar/gui/dialogs/comp-editor-page.c:440
-#, c-format
-msgid "Validation error: %s"
-msgstr "Erro de validación: %s"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:129
-#: ../calendar/gui/e-cal-ops.c:1968
-msgid "Destination is read only"
-msgstr "O destino é só de lectura"
-
-#: ../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: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?"
-msgstr ""
-"Desexa eliminar este elemento _das caixas de correo dos outros destinatarios?"
-
-#: ../calendar/gui/dialogs/delete-comp.c:218
-msgid "_Retract comment"
-msgstr "_Retirar o comentario"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Enter Delegate"
-msgstr "Introducir un delegado"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
-msgid "Delegate To:"
-msgstr "Delegar en:"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
-msgid "Contacts..."
-msgstr "Contactos…"
-
-#: ../calendar/gui/dialogs/event-editor.c:204
-msgid "_Reminders"
-msgstr "_Recordatorios"
-
-#: ../calendar/gui/dialogs/event-editor.c:206
-msgid "Set or unset reminders for this event"
-msgstr "Estabelcer ou desestabelecer os recordatorios desta actividade"
-
-#: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Show Time as _Busy"
-msgstr "Mostrar a hora como oc_upada"
-
-#: ../calendar/gui/dialogs/event-editor.c:216
-msgid "Toggles whether to show time as busy"
-msgstr "Alterna a vista das horas como ocupadas"
-
-#: ../calendar/gui/dialogs/event-editor.c:225
-msgid "_Recurrence"
-msgstr "_Repetición"
-
-#: ../calendar/gui/dialogs/event-editor.c:227
-msgid "Make this a recurring event"
-msgstr "Converter en actividade con repeticións"
-
-#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
-msgid "Send Options"
-msgstr "Opcións de envío"
-
-#: ../calendar/gui/dialogs/event-editor.c:234
-#: ../calendar/gui/dialogs/task-editor.c:95
-msgid "Insert advanced send options"
-msgstr "Inserir opcións avanzadas de envío"
-
-#: ../calendar/gui/dialogs/event-editor.c:242
-msgid "All _Day Event"
-msgstr "Actividade de _día completo"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
-msgid "Toggles whether to have All Day Event"
-msgstr "Alterna entre se se ten un actividade de día completo ou non"
-
-#: ../calendar/gui/dialogs/event-editor.c:253
-msgid "_Free/Busy"
-msgstr "_Dispoñibilidade"
-
-#: ../calendar/gui/dialogs/event-editor.c:255
-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:3486
-msgid "Appointment"
-msgstr "Cita"
-
-#: ../calendar/gui/dialogs/event-editor.c:376
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/e-meeting-list-view.c:164
-msgid "Attendees"
-msgstr "Participantes"
-
-#: ../calendar/gui/dialogs/event-editor.c:573
-msgid "Print this event"
-msgstr "Imprimir esta actividade"
-
-#: ../calendar/gui/dialogs/event-page.c:557
-msgid "Event's start time is in the past"
-msgstr "A hora de inicio da actividade xa pasou"
-
-#: ../calendar/gui/dialogs/event-page.c:634
-msgid "Event cannot be edited, because the selected calendar is read only"
-msgstr ""
-"Non é posíbel editar a actividade porque o calendario seleccionado é de só "
-"lectura"
-
-#: ../calendar/gui/dialogs/event-page.c:638
-msgid "Event cannot be fully edited, because you are not the organizer"
-msgstr ""
-"Non é posíbel editar a actividade totalmente porque vostede non é o "
-"organizador"
-
-#: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3198
-msgid "This event has reminders"
-msgstr "Esta actividade ten recordatorios"
-
-#: ../calendar/gui/dialogs/event-page.c:717
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "Or_ganizer:"
-msgstr "Or_ganizador:"
-
-#: ../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:1312
-msgid "Event with no end date"
-msgstr "Actividade sen data de finalización"
-
-#: ../calendar/gui/dialogs/event-page.c:1490
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1032
-msgid "Start date is wrong"
-msgstr "A data de inicio é incorrecta"
-
-#: ../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:1543
-msgid "Start time is wrong"
-msgstr "A hora de inicio é incorrecta"
-
-#: ../calendar/gui/dialogs/event-page.c:1551
-msgid "End time is wrong"
-msgstr "A hora de finalización é incorrecta"
-
-#: ../calendar/gui/dialogs/event-page.c:1715
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1086
-msgid "An organizer is required."
-msgstr "Requírese un organizador."
-
-#: ../calendar/gui/dialogs/event-page.c:1750
-#: ../calendar/gui/dialogs/task-page.c:1121
-msgid "At least one attendee is required."
-msgstr "Requírese polo menos un participante."
-
-#: ../calendar/gui/dialogs/event-page.c:1956
-msgid "_Delegatees"
-msgstr "_Delegados"
-
-#: ../calendar/gui/dialogs/event-page.c:1958
-msgid "Atte_ndees"
-msgstr "_Participantes"
-
-#: ../calendar/gui/dialogs/event-page.c:3478
-#, c-format
-msgid "%d day before appointment"
-msgid_plural "%d days before appointment"
-msgstr[0] "%d día antes da cita"
-msgstr[1] "%d días antes da cita"
-
-#: ../calendar/gui/dialogs/event-page.c:3484
-#, c-format
-msgid "%d hour before appointment"
-msgid_plural "%d hours before appointment"
-msgstr[0] "%d hora antes da cita"
-msgstr[1] "%d horas antes da cita"
-
-#: ../calendar/gui/dialogs/event-page.c:3490
-#, c-format
-msgid "%d minute before appointment"
-msgid_plural "%d minutes before appointment"
-msgstr[0] "%d minuto antes da cita"
-msgstr[1] "%d minutos antes da cita"
-
-#: ../calendar/gui/dialogs/event-page.c:3511
-msgid "Custom"
-msgstr "Personalizar"
-
-#. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3518
-msgctxt "cal-reminders"
-msgid "None"
-msgstr "Ningunha"
-
-#. TRANSLATORS:
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-msgctxt "eventpage"
-msgid "for"
-msgstr "durante"
-
-#. TRANSLATORS:
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgctxt "eventpage"
-msgid "until"
-msgstr "até"
-
-#. TRANSLATORS: Predefined reminder
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "15 minutos antes da cita"
-
-#. TRANSLATORS: Predefined reminder
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "1 hora antes da cita"
-
-#. TRANSLATORS: Predefined reminder
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "1 día antes da cita"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-msgid "_Location:"
-msgstr "_Localización:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../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:558
-#: ../e-util/e-html-editor-link-dialog.c:422
-msgid "_Description:"
-msgstr "_Descrición:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Time:"
-msgstr "_Hora:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Time _zone:"
-msgstr "Fuso _horario:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgid "_Summary:"
-msgstr "_Resumo:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:21
-msgid "Event Description"
-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:555
-msgid "Atte_ndees..."
-msgstr "Participa_ntes…"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:30
-msgid "_Reminder"
-msgstr "_Recordatorio"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "January"
-msgstr "Xaneiro"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "February"
-msgstr "Febreiro"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "March"
-msgstr "Marzo"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "April"
-msgstr "Abril"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "May"
-msgstr "Maio"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "June"
-msgstr "Xuño"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
-msgid "July"
-msgstr "Xullo"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "August"
-msgstr "Agosto"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "September"
-msgstr "Setembro"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "October"
-msgstr "Outubro"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
-msgid "November"
-msgstr "Novembro"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
-msgid "December"
-msgstr "Decembro"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-msgid "Select Date"
-msgstr "Seleccionar unha data"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../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:3490
-msgid "Memo"
-msgstr "Nota"
-
-#: ../calendar/gui/dialogs/memo-editor.c:155
-msgid "Print this memo"
-msgstr "Imprimir esta nota"
-
-#: ../calendar/gui/dialogs/memo-page.c:424
-msgid "Memo's start date is in the past"
-msgstr "A data de inicio da nota xa pasou"
-
-#: ../calendar/gui/dialogs/memo-page.c:460
-msgid "Memo cannot be edited, because the selected memo list is read only"
-msgstr ""
-"Non é posíbel editar a nota porque a lista de notas solicitada é de só "
-"lectura"
-
-#: ../calendar/gui/dialogs/memo-page.c:464
-msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr ""
-"Non é posíbel editar a nota na súa totalidade porque vostede non é o "
-"organizador"
-
-#: ../calendar/gui/dialogs/memo-page.c:1168
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
-#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
-#: ../modules/mail/em-mailer-prefs.c:64
-msgid "To"
-msgstr "Para"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:426
-#: ../calendar/gui/dialogs/task-page.ui.h:34
-msgid "_List:"
-msgstr "_Lista:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:434
-#: ../calendar/gui/dialogs/task-page.ui.h:24
-msgid "Organi_zer:"
-msgstr "Organi_zador:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:5
-msgid "T_o:"
-msgstr "_Para:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:26
-msgid "Sta_rt date:"
-msgstr "Data de _inicio:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:23
-msgid "Su_mmary:"
-msgstr "Resu_mo:"
-
-#: ../calendar/gui/dialogs/recur-comp.c:52
-#, c-format
-msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "Está modificando unha actividade con repetición. Que desexa modificar?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:54
-#, c-format
-msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "Está delegando unha actividade con repetición. Que desexa delegar?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:58
-#, c-format
-msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "Está modificando unha tarefa con repetición. Que desexa modificar?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:62
-#, c-format
-msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "Está modificando unha nota con repetición. Que desexa modificar?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:88
-msgid "This Instance Only"
-msgstr "Unicamente esta instancia"
-
-#: ../calendar/gui/dialogs/recur-comp.c:92
-msgid "This and Prior Instances"
-msgstr "Esta instancia e as anteriores"
-
-#: ../calendar/gui/dialogs/recur-comp.c:98
-msgid "This and Future Instances"
-msgstr "Esta instancia e as futuras"
-
-#: ../calendar/gui/dialogs/recur-comp.c:103
-msgid "All Instances"
-msgstr "Todas as instancias"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:574
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Esta cita contén repeticións que o Evolution non pode editar."
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1005
-msgid "Recurrence date is invalid"
-msgstr "A data da repetición non é correcta"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-msgid "End time of the recurrence was before event's start"
-msgstr ""
-"A hora de finalización da repetición era anterior á do inicio da actividade"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1078
-msgid "on"
-msgstr "en"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1159
-msgid "first"
-msgstr "primeiro"
-
-#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
-#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] 
[forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1165
-msgid "second"
-msgstr "segundo"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1170
-msgid "third"
-msgstr "terceiro"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1175
-msgid "fourth"
-msgstr "cuarto"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
-msgid "fifth"
-msgstr "quinto"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1185
-msgid "last"
-msgstr "último"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
-#. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1209
-msgid "Other Date"
-msgstr "Outra data"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1215
-msgid "1st to 10th"
-msgstr "Do 1 ao 10"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1221
-msgid "11th to 20th"
-msgstr "do 11 ao 20"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1227
-msgid "21st to 31st"
-msgstr "Do 21 ao 31"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-msgid "Monday"
-msgstr "Luns"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
-msgid "Tuesday"
-msgstr "Martes"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Wednesday"
-msgstr "Mércores"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1257
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
-msgid "Thursday"
-msgstr "Xoves"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1258
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "Friday"
-msgstr "Venres"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1259
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
-msgid "Saturday"
-msgstr "Sábado"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1260
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
-msgid "Sunday"
-msgstr "Domingo"
-
-#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
-#. * (dropdown menu options are in [square brackets])."
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1391
-msgid "on the"
-msgstr "no"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1576
-msgid "occurrences"
-msgstr "aparicións"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2346
-msgid "Add exception"
-msgstr "Engadir unha excepción"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2388
-msgid "Could not get a selection to modify."
-msgstr "Non foi posíbel obter unha selección para modificar."
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2394
-msgid "Modify exception"
-msgstr "Modificar a excepción"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2440
-msgid "Could not get a selection to delete."
-msgstr "Non foi posíbel obter unha selección para eliminar."
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2581
-msgid "Date/Time"
-msgstr "Data e hora"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgctxt "recurrpage"
-msgid "day(s)"
-msgstr "día(s)"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "semana(s)"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
-msgctxt "recurrpage"
-msgid "month(s)"
-msgstr "mes(es)"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "ano(s)"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-msgctxt "recurrpage"
-msgid "for"
-msgstr "durante"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-msgctxt "recurrpage"
-msgid "until"
-msgstr "até"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-msgctxt "recurrpage"
-msgid "forever"
-msgstr "Indefinidamente"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgid "This appointment rec_urs"
-msgstr "Esta cita r_epítese"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
-msgid "Every"
-msgstr "Cada"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-msgid "Exceptions"
-msgstr "Excepcións"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
-msgid "Preview"
-msgstr "Vista previa"
-
-#: ../calendar/gui/dialogs/send-comp.c:172
-#: ../calendar/gui/dialogs/send-comp.c:254
-msgid "Send my reminders with this event"
-msgstr "Enviar os meus recordatorios con esta actividade"
-
-#: ../calendar/gui/dialogs/send-comp.c:174
-#: ../calendar/gui/dialogs/send-comp.c:256
-msgid "Notify new attendees _only"
-msgstr "Notificar só aos participantes n_ovos"
-
-#: ../calendar/gui/dialogs/task-editor.c:93
-msgid "_Send Options"
-msgstr "Opción_s de envío"
-
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
-#: ../e-util/e-send-options.c:553
-msgid "Task"
-msgstr "Tarefa"
-
-#: ../calendar/gui/dialogs/task-editor.c:285
-msgid "Print this task"
-msgstr "Imprimir esta tarefa"
-
-#: ../calendar/gui/dialogs/task-page.c:330
-msgid "Task's start date is in the past"
-msgstr "A data de inicio da tarefa xa pasou"
-
-#: ../calendar/gui/dialogs/task-page.c:331
-msgid "Task's due date is in the past"
-msgstr "A data de vencemento da tarefa xa pasou"
-
-#: ../calendar/gui/dialogs/task-page.c:364
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr ""
-"Non é posíbel editar a tarefa porque a lista de tarefas seleccionada é de só "
-"lectura"
-
-#: ../calendar/gui/dialogs/task-page.c:368
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr ""
-"Non é posíbel editar a tarefa na súa totalidade porque vostede non é o "
-"organizador"
-
-#: ../calendar/gui/dialogs/task-page.c:372
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-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:1013
-msgid "Due date is wrong"
-msgstr "A data de vencemento é incorrecta"
-
-#: ../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: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:313
-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:340
-#: ../calendar/gui/e-cal-model.c:1856 ../calendar/gui/e-task-table.c:525
-#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:312
-msgid "Normal"
-msgstr "Normal"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:342
-#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
-msgid "Low"
-msgstr "Baixa"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:14 ../calendar/gui/e-task-table.c:527
-#: ../calendar/gui/tasktypes.xml.h:22 ../e-util/e-send-options.ui.h:1
-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:323
-#: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../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: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: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: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: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"
-msgstr "Completada"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c: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:963
-msgid "Canceled"
-msgstr "Cancelada"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:25
-msgid "D_ue date:"
-msgstr "D_ata de vencemento:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:28
-msgid "Time zone:"
-msgstr "Fuso horario:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:35
-msgid "_Status:"
-msgstr "_Estado:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:36
-msgid "Date _completed:"
-msgstr "Data _completada:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:37
-msgid "_Percent complete:"
-msgstr "_Porcentaxe completada:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:38
-msgid "Priorit_y:"
-msgstr "Priorida_de:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:39
-msgid "C_lassification:"
-msgstr "C_lasificación:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:40
-msgid "_Web Page:"
-msgstr "Páxina _Web:"
-
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../calendar/gui/ea-cal-view.c:283
 msgid "New Appointment"
 msgstr "Nova cita"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New All Day Event"
 msgstr "Nova actividade de día completo"
 
-#: ../calendar/gui/ea-cal-view.c:286
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New Meeting"
 msgstr "Nova xuntanza"
 
-#: ../calendar/gui/ea-cal-view.c:287
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "Go to Today"
 msgstr "Ir ao día de hoxe"
 
-#: ../calendar/gui/ea-cal-view.c:288
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Date"
 msgstr "Ir á data"
 
@@ -4301,7 +3039,7 @@ msgstr "Botón de salto"
 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"
+#. Translator: Entire string is like "Pop up an alert %d days before start"
 #: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
@@ -4309,7 +3047,7 @@ msgid_plural "%d days"
 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"
+#. Translator: Entire string is like "Pop up an alert %d weeks before start"
 #: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
@@ -4317,55 +3055,92 @@ msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: ../calendar/gui/e-alarm-list.c:438
+#. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:421
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1828
+msgctxt "cal-reminders"
+msgid "Play a sound"
+msgstr "Reproducir un son"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:425
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1826
+msgctxt "cal-reminders"
+msgid "Pop up an alert"
+msgstr "Mostrar unha alerta"
+
+#. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:429
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1832
+msgctxt "cal-reminders"
+msgid "Send an email"
+msgstr "Enviar un correo"
+
+#. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:433
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1830
+msgctxt "cal-reminders"
+msgid "Run a program"
+msgstr "Executar un pograma"
+
+#: ../calendar/gui/e-alarm-list.c:439
+msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
-msgstr "Descoñécese a acción a realizar"
+msgstr "Acción despoñecida a levar a cabo"
 
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:454
 #, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s antes do inicio da cita"
+msgctxt "cal-reminders"
+msgid "%s %s before the start"
+msgstr "%s %s antes do inicio"
 
-#: ../calendar/gui/e-alarm-list.c:459
+#: ../calendar/gui/e-alarm-list.c:460
 #, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s despois do inicio da cita"
+msgctxt "cal-reminders"
+msgid "%s %s after the start"
+msgstr "%s %s despois do inicio"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:466
+#: ../calendar/gui/e-alarm-list.c:467
 #, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s ao inicio da cita"
+msgctxt "cal-reminders"
+msgid "%s at the start"
+msgstr "%s ao inicio"
 
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s antes de finalizar a cita"
+msgctxt "cal-reminders"
+msgid "%s %s before the end"
+msgstr "%s %s antes do final"
 
-#: ../calendar/gui/e-alarm-list.c:484
+#: ../calendar/gui/e-alarm-list.c:485
 #, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s despois de finalizar a cita"
+msgctxt "cal-reminders"
+msgid "%s %s after the end"
+msgstr "%s %s despois do final"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:492
 #, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s ao finalizar a cita"
+msgctxt "cal-reminders"
+msgid "%s at the end"
+msgstr "%s ao final"
 
 #. 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:515
+#: ../calendar/gui/e-alarm-list.c:516
 #, c-format
+msgctxt "cal-reminders"
 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:523
+#: ../calendar/gui/e-alarm-list.c:524
 #, c-format
+msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador descoñecido"
 
@@ -4387,47 +3162,101 @@ msgstr "vista de calendario para un mes"
 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:768
+#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:768
 #: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Sen título"
 
-#: ../calendar/gui/e-cal-component-preview.c:230
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Categories:"
 msgstr "Categorías:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:256
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:273
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Start Date:"
 msgstr "Data de inicio:"
 
-#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "End Date:"
 msgstr "Data de finalización:"
 
-#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-component-preview.c:286
 msgid "Due Date:"
 msgstr "Data de vencemento:"
 
-#: ../calendar/gui/e-cal-component-preview.c:309
+#: ../calendar/gui/e-cal-component-preview.c:298
 #: ../modules/itip-formatter/itip-view.c:1517
 #: ../modules/itip-formatter/itip-view.c:1634
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../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:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3582
+msgid "In Progress"
+msgstr "En progreso"
+
+#: ../calendar/gui/e-cal-component-preview.c:305
+#: ../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:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3585
+#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
+msgid "Completed"
+msgstr "Completada"
+
+#: ../calendar/gui/e-cal-component-preview.c:308
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3588 ../mail/mail-send-recv.c:963
+msgid "Canceled"
+msgstr "Cancelada"
+
+#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:310
+#: ../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:3579 ../calendar/gui/tasktypes.xml.h:11
+msgid "Not Started"
+msgstr "Non iniciada"
+
+#: ../calendar/gui/e-cal-component-preview.c:325
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-component-preview.c:361
+#: ../calendar/gui/e-cal-component-preview.c:327
+#: ../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:316
+msgid "High"
+msgstr "Alta"
+
+#: ../calendar/gui/e-cal-component-preview.c:329
+#: ../calendar/gui/e-cal-model.c:1890 ../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:315
+msgid "Normal"
+msgstr "Normal"
+
+#: ../calendar/gui/e-cal-component-preview.c:331
+#: ../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:314
+msgid "Low"
+msgstr "Baixa"
+
+#: ../calendar/gui/e-cal-component-preview.c:350
 #: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../calendar/gui/e-cal-component-preview.c:392
+#: ../calendar/gui/e-cal-component-preview.c:381
 msgid "Web Page:"
 msgstr "Páxina Web:"
 
@@ -4446,113 +3275,179 @@ msgstr "Creando vistas para a lista de tarefas «%s»"
 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"
-msgstr "Prema para engadir unha tarefa"
+#: ../calendar/gui/e-cal-dialogs.c:214 ../calendar/gui/e-cal-ops.c:1957
+msgid "Destination is read only"
+msgstr "O destino é só de lectura"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-msgid "Start date"
-msgstr "Data de inicio"
+#: ../calendar/gui/e-cal-dialogs.c:294
+#, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "Copiando eventos no calendario %s"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:670
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:157
-msgid "Type"
-msgstr "Tipo"
+#: ../calendar/gui/e-cal-dialogs.c:300
+#, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "Copiando recordatorios na lista de recordatorios «%s»"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Completion date"
-msgstr "Data de conclusión"
+#: ../calendar/gui/e-cal-dialogs.c:306
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "Copiando tarefas na lista de tarefas «%s»"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:965
-msgid "Complete"
-msgstr "Completado"
+#: ../calendar/gui/e-cal-dialogs.c:525
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr ""
+"Desexa eliminar este elemento _das caixas de correo dos outros destinatarios?"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-msgid "Due date"
-msgstr "Data de vencemento"
+#: ../calendar/gui/e-cal-dialogs.c:528
+msgid "_Retract comment"
+msgstr "_Retirar o comentario"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#, no-c-format
-msgid "% Complete"
-msgstr "% completado"
+#: ../calendar/gui/e-cal-dialogs.c:687
+msgid "Select Date"
+msgstr "Seleccionar unha data"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18 ../plugins/save-calendar/csv-format.c:386
-msgid "Priority"
-msgstr "Prioridade"
+#: ../calendar/gui/e-cal-dialogs.c:688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+msgid "Select _Today"
+msgstr "Seleccionar o día de _hoxe"
 
-#. 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:3845 ../calendar/gui/e-meeting-list-view.c:713
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
-#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
-#: ../mail/vfoldertypes.xml.in.h:36
-msgid "Status"
-msgstr "Estado"
+#: ../calendar/gui/e-cal-dialogs.c:707
+msgid "January"
+msgstr "Xaneiro"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:380
-msgid "Created"
-msgstr "Creado"
+#: ../calendar/gui/e-cal-dialogs.c:708
+msgid "February"
+msgstr "Febreiro"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
-msgid "Last modified"
-msgstr "Última modificación"
+#: ../calendar/gui/e-cal-dialogs.c:709
+msgid "March"
+msgstr "Marzo"
+
+#: ../calendar/gui/e-cal-dialogs.c:710
+msgid "April"
+msgstr "Abril"
+
+#: ../calendar/gui/e-cal-dialogs.c:711
+msgid "May"
+msgstr "Maio"
+
+#: ../calendar/gui/e-cal-dialogs.c:712
+msgid "June"
+msgstr "Xuño"
+
+#: ../calendar/gui/e-cal-dialogs.c:713
+msgid "July"
+msgstr "Xullo"
+
+#: ../calendar/gui/e-cal-dialogs.c:714
+msgid "August"
+msgstr "Agosto"
+
+#: ../calendar/gui/e-cal-dialogs.c:715
+msgid "September"
+msgstr "Setembro"
+
+#: ../calendar/gui/e-cal-dialogs.c:716
+msgid "October"
+msgstr "Outubro"
+
+#: ../calendar/gui/e-cal-dialogs.c:717
+msgid "November"
+msgstr "Novembro"
+
+#: ../calendar/gui/e-cal-dialogs.c:718
+msgid "December"
+msgstr "Decembro"
+
+#: ../calendar/gui/e-cal-dialogs.c:868
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "Está modificando unha actividade con repetición. Que desexa modificar?"
+
+#: ../calendar/gui/e-cal-dialogs.c:870
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "Está delegando unha actividade con repetición. Que desexa delegar?"
+
+#: ../calendar/gui/e-cal-dialogs.c:874
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "Está modificando unha tarefa con repetición. Que desexa modificar?"
+
+#: ../calendar/gui/e-cal-dialogs.c:878
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Está modificando unha nota con repetición. Que desexa modificar?"
+
+#: ../calendar/gui/e-cal-dialogs.c:904
+msgid "This Instance Only"
+msgstr "Unicamente esta instancia"
 
-#: ../calendar/gui/e-calendar-view.c:459
+#: ../calendar/gui/e-cal-dialogs.c:908
+msgid "This and Prior Instances"
+msgstr "Esta instancia e as anteriores"
+
+#: ../calendar/gui/e-cal-dialogs.c:914
+msgid "This and Future Instances"
+msgstr "Esta instancia e as futuras"
+
+#: ../calendar/gui/e-cal-dialogs.c:919
+msgid "All Instances"
+msgstr "Todas as instancias"
+
+#: ../calendar/gui/e-cal-dialogs.c:1169 ../calendar/gui/e-cal-dialogs.c:1251
+msgid "Send my reminders with this event"
+msgstr "Enviar os meus recordatorios con esta actividade"
+
+#: ../calendar/gui/e-cal-dialogs.c:1171 ../calendar/gui/e-cal-dialogs.c:1253
+msgid "Notify new attendees _only"
+msgstr "Notificar só aos participantes n_ovos"
+
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Cut selected events to the clipboard"
 msgstr "Cortar as actividades seleccionadas para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:465
+#: ../calendar/gui/e-calendar-view.c:458
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar as actividades seleccionadas para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:471
+#: ../calendar/gui/e-calendar-view.c:464
 msgid "Paste events from the clipboard"
 msgstr "Pegar as actividades desde o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:477
+#: ../calendar/gui/e-calendar-view.c:470
 msgid "Delete selected events"
 msgstr "Eliminar as actividades seleccionadas"
 
-#: ../calendar/gui/e-calendar-view.c:859
+#: ../calendar/gui/e-calendar-view.c:852
 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:870 ../calendar/gui/e-cal-ops.c:1567
+#: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1554
 msgid "Default calendar not found"
 msgstr "Calendario por omisión non atopado"
 
-#: ../calendar/gui/e-calendar-view.c:875 ../calendar/gui/e-cal-ops.c:1570
+#: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1557
 msgid "Default memo list not found"
 msgstr "Lista de recordatorios por omisión non atopada"
 
-#: ../calendar/gui/e-calendar-view.c:880 ../calendar/gui/e-cal-ops.c:1573
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1560
 msgid "Default task list not found"
 msgstr "Lista de tarefas por omisión non atopada"
 
-#: ../calendar/gui/e-calendar-view.c:969
+#: ../calendar/gui/e-calendar-view.c:962
 msgid "No suitable component found"
 msgstr "Non se atopou un compoñente non axeitado"
 
-#: ../calendar/gui/e-calendar-view.c:1039
+#: ../calendar/gui/e-calendar-view.c:1032
 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:1842 ../calendar/gui/e-memo-table.c:493
+#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:492
 #: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4561,29 +3456,29 @@ msgstr "Organizador: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1846 ../calendar/gui/e-memo-table.c:498
+#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:497
 #: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1862
-#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3527
+#: ../calendar/gui/e-calendar-view.c:1850
+#: ../calendar/gui/e-meeting-time-sel.c:2731 ../calendar/gui/print.c:3533
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1902
+#: ../calendar/gui/e-calendar-view.c:1890
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2281
-#: ../calendar/gui/e-calendar-view.c:2288
-#: ../calendar/gui/e-calendar-view.c:2295
-#: ../calendar/gui/e-calendar-view.c:2298
+#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2276
+#: ../calendar/gui/e-calendar-view.c:2283
+#: ../calendar/gui/e-calendar-view.c:2286
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -4592,13 +3487,13 @@ msgstr "%d de %b de %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2286 ../calendar/gui/e-day-view.c:3052
-#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-calendar-view.c:2274 ../calendar/gui/e-day-view.c:3050
+#: ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: ../calendar/gui/e-calendar-view.c:2308
+#: ../calendar/gui/e-calendar-view.c:2296
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
@@ -4608,15 +3503,15 @@ msgstr "%A, %d de %b de %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2312 ../calendar/gui/e-day-view.c:3036
-#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-calendar-view.c:2300 ../calendar/gui/e-day-view.c:3034
+#: ../calendar/gui/e-day-view-top-item.c:847
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
-#: ../calendar/gui/e-calendar-view.c:2315
-#: ../calendar/gui/e-calendar-view.c:2321
-#: ../calendar/gui/e-calendar-view.c:2324
+#: ../calendar/gui/e-calendar-view.c:2303
+#: ../calendar/gui/e-calendar-view.c:2309
+#: ../calendar/gui/e-calendar-view.c:2312
 msgid "%a %d %b %Y"
 msgstr "%a, %d de %b de %Y"
 
@@ -4629,94 +3524,124 @@ msgstr "Data de inicio"
 msgid "End Date"
 msgstr "Data de finalización"
 
-#: ../calendar/gui/e-cal-model.c:319 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-task-table.etspec.h:13
+#: ../plugins/save-calendar/csv-format.c:380
+msgid "Created"
+msgstr "Creado"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../calendar/gui/e-task-table.etspec.h:14
+msgid "Last modified"
+msgstr "Última modificación"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:8
+#: ../calendar/gui/e-task-table.etspec.h:15
+#: ../em-format/e-mail-formatter-source.c:120
+msgid "Source"
+msgstr "Fonte"
+
+#: ../calendar/gui/e-cal-model.c:318 ../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
+#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1249
+#: ../calendar/gui/print.c:1266 ../e-util/e-charset.c:51
 #: ../modules/itip-formatter/itip-view.c:3604
 #: ../modules/itip-formatter/itip-view.c:6218
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../calendar/gui/e-cal-model.c:1394 ../calendar/gui/e-cal-ops.c:596
-#: ../calendar/gui/e-cal-ops.c:1232
-#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#: ../calendar/gui/e-cal-model.c:1404 ../calendar/gui/e-cal-ops.c:615
+#: ../calendar/gui/e-cal-ops.c:1251
+#: ../modules/calendar/e-cal-base-shell-backend.c:291
 #, c-format
 msgid "Source with UID '%s' not found"
 msgstr "A orixe con UID «%s» non se atopou"
 
-#: ../calendar/gui/e-cal-model.c:1480 ../calendar/gui/e-cal-ops.c:185
-#: ../calendar/gui/e-cal-ops.c:1349
+#: ../calendar/gui/e-cal-model.c:1507 ../calendar/gui/e-cal-ops.c:187
+#: ../calendar/gui/e-cal-ops.c:1368
 msgid "Creating an event"
 msgstr "Creando un evento"
 
-#: ../calendar/gui/e-cal-model.c:1484 ../calendar/gui/e-cal-ops.c:189
-#: ../calendar/gui/e-cal-ops.c:1353
+#: ../calendar/gui/e-cal-model.c:1511 ../calendar/gui/e-cal-ops.c:191
+#: ../calendar/gui/e-cal-ops.c:1372
 msgid "Creating a memo"
 msgstr "Creando un recordatorio"
 
-#: ../calendar/gui/e-cal-model.c:1488 ../calendar/gui/e-cal-ops.c:193
-#: ../calendar/gui/e-cal-ops.c:1357
+#: ../calendar/gui/e-cal-model.c:1515 ../calendar/gui/e-cal-ops.c:195
+#: ../calendar/gui/e-cal-ops.c:1376
 msgid "Creating a task"
 msgstr "Creando unha tarefa"
 
-#: ../calendar/gui/e-cal-model.c:1858
+#: ../calendar/gui/e-cal-model.c:1892
 msgid "Recurring"
 msgstr "Repetición"
 
-#: ../calendar/gui/e-cal-model.c:1860
+#: ../calendar/gui/e-cal-model.c:1894
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:3786 ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3820 ../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:6206
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-cal-model.c:3787 ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3821 ../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:6212
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-cal-model.c:3788 ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3822 ../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:535
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-cal-model.c:3789 ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3823 ../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:6215
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-cal-model.c:3790
+#: ../calendar/gui/e-cal-model.c:3824
 msgid "Needs action"
 msgstr "Necesita unha acción"
 
-#: ../calendar/gui/e-cal-model-calendar.c:151
+#. 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-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:688
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/e-task-table.etspec.h:11 ../calendar/gui/tasktypes.xml.h:8
+#: ../mail/filtertypes.xml.in.h:36 ../mail/message-list.etspec.h:1
+#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "Estado"
+
+#: ../calendar/gui/e-cal-model-calendar.c:150
 #: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Libre"
 
-#: ../calendar/gui/e-cal-model-calendar.c:154
+#: ../calendar/gui/e-cal-model-calendar.c:153
 #: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Ocupado"
@@ -4737,166 +3662,166 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ningún"
 
-#: ../calendar/gui/e-cal-ops.c:287
+#: ../calendar/gui/e-cal-ops.c:306
 msgid "Modifying an event"
 msgstr "Modificando un evento"
 
-#: ../calendar/gui/e-cal-ops.c:291
+#: ../calendar/gui/e-cal-ops.c:310
 msgid "Modifying a memo"
 msgstr "Modificando un recordatorio"
 
-#: ../calendar/gui/e-cal-ops.c:295
+#: ../calendar/gui/e-cal-ops.c:314
 msgid "Modifying a task"
 msgstr "Modificando unha lista de tarefas"
 
-#: ../calendar/gui/e-cal-ops.c:394
+#: ../calendar/gui/e-cal-ops.c:413
 msgid "Removing an event"
 msgstr "Eliminando un evento"
 
-#: ../calendar/gui/e-cal-ops.c:398
+#: ../calendar/gui/e-cal-ops.c:417
 msgid "Removing a memo"
 msgstr "Eliminando un recordatorio"
 
-#: ../calendar/gui/e-cal-ops.c:402
+#: ../calendar/gui/e-cal-ops.c:421
 msgid "Removing a task"
 msgstr "Eliminando unha tarefa"
 
-#: ../calendar/gui/e-cal-ops.c:493
+#: ../calendar/gui/e-cal-ops.c:512
 #, 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:497
+#: ../calendar/gui/e-cal-ops.c:516
 #, 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:501
+#: ../calendar/gui/e-cal-ops.c:520
 #, 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:704
+#: ../calendar/gui/e-cal-ops.c:723
 #, 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:719
+#: ../calendar/gui/e-cal-ops.c:738
 #, 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:734
+#: ../calendar/gui/e-cal-ops.c:753
 #, 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:833
+#: ../calendar/gui/e-cal-ops.c:852
 msgid "Updating an event"
 msgstr "Actualizando un evento"
 
-#: ../calendar/gui/e-cal-ops.c:837
+#: ../calendar/gui/e-cal-ops.c:856
 msgid "Updating a memo"
 msgstr "Actualizando un recordatorio"
 
-#: ../calendar/gui/e-cal-ops.c:841
+#: ../calendar/gui/e-cal-ops.c:860
 msgid "Updating a task"
 msgstr "Actualizando unha tarefa"
 
-#: ../calendar/gui/e-cal-ops.c:949
+#: ../calendar/gui/e-cal-ops.c:968
 #, 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:953
+#: ../calendar/gui/e-cal-ops.c:972
 #, 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:957
+#: ../calendar/gui/e-cal-ops.c:976
 #, 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:983
+#: ../calendar/gui/e-cal-ops.c:1002
 #, c-format
 msgid "Purging events in the calendar '%s'"
 msgstr "Eliminando eventos no calendario «%s»"
 
-#: ../calendar/gui/e-cal-ops.c:987
+#: ../calendar/gui/e-cal-ops.c:1006
 #, c-format
 msgid "Purging memos in the memo list '%s'"
 msgstr "Eliminando recordatorios na lista de recordatorios «%s»"
 
-#: ../calendar/gui/e-cal-ops.c:991
+#: ../calendar/gui/e-cal-ops.c:1010
 #, c-format
 msgid "Purging tasks in the task list '%s'"
 msgstr "Eliminando tarefas na lista de tarefas «%s»"
 
-#: ../calendar/gui/e-cal-ops.c:1091
+#: ../calendar/gui/e-cal-ops.c:1110
 msgid "Purging events"
 msgstr "Eliminando eventos"
 
-#: ../calendar/gui/e-cal-ops.c:1095
+#: ../calendar/gui/e-cal-ops.c:1114
 msgid "Purging memos"
 msgstr "Eliminando recordatorios"
 
-#: ../calendar/gui/e-cal-ops.c:1099
+#: ../calendar/gui/e-cal-ops.c:1118
 msgid "Purging tasks"
 msgstr "Eliminando tarefas"
 
-#: ../calendar/gui/e-cal-ops.c:1201
+#: ../calendar/gui/e-cal-ops.c:1220
 msgid "Expunging completed tasks"
 msgstr "Compactando tarefas completadas"
 
-#: ../calendar/gui/e-cal-ops.c:2062
+#: ../calendar/gui/e-cal-ops.c:2051
 #, 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:2063
+#: ../calendar/gui/e-cal-ops.c:2052
 #, 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:2069
+#: ../calendar/gui/e-cal-ops.c:2058
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Movendo un recordatorio"
 msgstr[1] "Movendo %d recordatorios"
 
-#: ../calendar/gui/e-cal-ops.c:2070
+#: ../calendar/gui/e-cal-ops.c:2059
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Copiando un recordatorio"
 msgstr[1] "Copiando %d recordatorios"
 
-#: ../calendar/gui/e-cal-ops.c:2076
+#: ../calendar/gui/e-cal-ops.c:2065
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Movendo unha tarefa"
 msgstr[1] "Movendo %d tarefas"
 
-#: ../calendar/gui/e-cal-ops.c:2077
+#: ../calendar/gui/e-cal-ops.c:2066
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -4922,17 +3847,1148 @@ msgstr ""
 "A data ten que ser introducida no formato: \n"
 "%s"
 
+#: ../calendar/gui/e-comp-editor-event.c:101
+msgid "Event's time is in the past"
+msgstr "A hora do evento esta no pasado"
+
+#: ../calendar/gui/e-comp-editor-event.c:202
+msgid ""
+"Event cannot be edited, because the selected calendar could not be opened"
+msgstr ""
+"Non é posíbel editar o evento porque o calendario seleccionado non se pode "
+"abrir"
+
+#: ../calendar/gui/e-comp-editor-event.c:204
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr ""
+"Non é posíbel editar a actividade porque o calendario seleccionado é de só "
+"lectura"
+
+#: ../calendar/gui/e-comp-editor-event.c:206
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr ""
+"Non é posíbel editar a actividade totalmente porque vostede non é o "
+"organizador"
+
+#: ../calendar/gui/e-comp-editor-event.c:350
+#: ../calendar/gui/e-comp-editor-task.c:348
+msgid "Start date is not a valid date"
+msgstr "A data de inicio é unha data válida"
+
+#: ../calendar/gui/e-comp-editor-event.c:352
+msgid "Start time is not a valid time"
+msgstr "A hora de inicio é unha hora válida"
+
+#: ../calendar/gui/e-comp-editor-event.c:356
+#: ../calendar/gui/e-comp-editor-event.c:372
+#: ../calendar/gui/e-comp-editor-page-attachments.c:211
+#: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-reader-utils.c:650
+#: ../mail/mail-send-recv.c:486 ../mail/mail-send-recv.c:1285
+#: ../plugins/face/face.c:176 ../shell/e-shell.c:991 ../shell/e-shell.c:1013
+#: ../smime/gui/certificate-manager.c:346
+msgid "Unknown error"
+msgstr "Erro descoñecido"
+
+#: ../calendar/gui/e-comp-editor-event.c:366
+msgid "End date is not a valid date"
+msgstr "A data de finalización non é unha data válida"
+
+#: ../calendar/gui/e-comp-editor-event.c:368
+msgid "End time is not a valid time"
+msgstr "A hora de fin é unha hora válida"
+
+#: ../calendar/gui/e-comp-editor-event.c:490
+#: ../calendar/gui/e-comp-editor-memo.c:106
+#: ../calendar/gui/e-comp-editor-task.c:406
+msgid "_Categories"
+msgstr "_Categorías"
+
+#: ../calendar/gui/e-comp-editor-event.c:492
+#: ../calendar/gui/e-comp-editor-memo.c:108
+#: ../calendar/gui/e-comp-editor-task.c:408
+msgid "Toggles whether to display categories"
+msgstr "Alterna a vista das categorías"
+
+#: ../calendar/gui/e-comp-editor-event.c:498
+msgid "Time _Zone"
+msgstr "_Fuso horario"
+
+#: ../calendar/gui/e-comp-editor-event.c:500
+msgid "Toggles whether the time zone is displayed"
+msgstr "Alterna a vista do fuso horario"
+
+#: ../calendar/gui/e-comp-editor-event.c:506
+msgid "All _Day Event"
+msgstr "Actividade de _día completo"
+
+#: ../calendar/gui/e-comp-editor-event.c:508
+msgid "Toggles whether to have All Day Event"
+msgstr "Alterna entre se se ten un actividade de día completo ou non"
+
+#: ../calendar/gui/e-comp-editor-event.c:514
+msgid "Show Time as _Busy"
+msgstr "Mostrar a hora como oc_upada"
+
+#: ../calendar/gui/e-comp-editor-event.c:516
+msgid "Toggles whether to show time as busy"
+msgstr "Alterna a vista das horas como ocupadas"
+
+#: ../calendar/gui/e-comp-editor-event.c:525
+msgid "Pu_blic"
+msgstr "Pú_blico"
+
+#: ../calendar/gui/e-comp-editor-event.c:527
+msgid "Classify as public"
+msgstr "Clasificar como público"
+
+#: ../calendar/gui/e-comp-editor-event.c:532
+msgid "_Private"
+msgstr "_Privado"
+
+#: ../calendar/gui/e-comp-editor-event.c:534
+msgid "Classify as private"
+msgstr "Clasificar como privado"
+
+#: ../calendar/gui/e-comp-editor-event.c:539
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: ../calendar/gui/e-comp-editor-event.c:541
+msgid "Classify as confidential"
+msgstr "Clasificar como confidencial"
+
+#: ../calendar/gui/e-comp-editor-event.c:642
+msgctxt "ECompEditor"
+msgid "_Start time:"
+msgstr "Hora de _inicio:"
+
+#: ../calendar/gui/e-comp-editor-event.c:647
+msgctxt "ECompEditor"
+msgid "_End time:"
+msgstr "Hora de _finalización:"
+
+#: ../calendar/gui/e-comp-editor-event.c:657
+msgctxt "ECompEditor"
+msgid "All da_y event"
+msgstr "Actividade de _día completo"
+
+#: ../calendar/gui/e-comp-editor-event.c:710
+#: ../calendar/gui/e-comp-editor-memo.c:192
+#: ../calendar/gui/e-comp-editor-task.c:529
+msgctxt "ECompEditorPage"
+msgid "General"
+msgstr "Xeral"
+
+#: ../calendar/gui/e-comp-editor-event.c:713
+#: ../calendar/gui/e-comp-editor-task.c:535
+msgctxt "ECompEditorPage"
+msgid "Reminders"
+msgstr "Recordatorios"
+
+#: ../calendar/gui/e-comp-editor-event.c:716
+msgctxt "ECompEditorPage"
+msgid "Recurrence"
+msgstr "Repetición"
+
+#: ../calendar/gui/e-comp-editor-event.c:719
+#: ../calendar/gui/e-comp-editor-memo.c:195
+#: ../calendar/gui/e-comp-editor-task.c:538
+msgctxt "ECompEditorPage"
+msgid "Attachments"
+msgstr "Anexos"
+
+#: ../calendar/gui/e-comp-editor-event.c:729
+msgctxt "ECompEditorPage"
+msgid "Schedule"
+msgstr "Planificación"
+
+#: ../calendar/gui/e-comp-editor-event.c:758
+#, c-format
+msgid "Meeting - %s"
+msgstr "Reunión - %s"
+
+#: ../calendar/gui/e-comp-editor-event.c:759
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: ../calendar/gui/e-comp-editor-memo.c:68
+msgid ""
+"Memo cannot be edited, because the selected memo list could not be opened"
+msgstr ""
+"Non é posíbel editar o recordatorio, porque a lista de recordatorios non se "
+"pode abrir"
+
+#: ../calendar/gui/e-comp-editor-memo.c:70
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr ""
+"Non é posíbel editar a nota porque a lista de notas solicitada é de só "
+"lectura"
+
+#: ../calendar/gui/e-comp-editor-memo.c:72
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr ""
+"Non é posíbel editar a nota na súa totalidade porque vostede non é o "
+"organizador"
+
+#: ../calendar/gui/e-comp-editor-memo.c:168
+#: ../calendar/gui/e-comp-editor-task.c:468
+msgid "_List:"
+msgstr "_Lista:"
+
+#: ../calendar/gui/e-comp-editor-memo.c:175
+#: ../calendar/gui/e-comp-editor-task.c:475
+msgctxt "ECompEditor"
+msgid "Sta_rt date:"
+msgstr "Data de _inicio:"
+
+#: ../calendar/gui/e-comp-editor-memo.c:223
+#, c-format
+msgid "Assigned Memo - %s"
+msgstr "Recordatorio asignado - %s"
+
+#: ../calendar/gui/e-comp-editor-memo.c:224
+#, c-format
+msgid "Memo - %s"
+msgstr "Nota - %s"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:125
+#: ../calendar/gui/e-comp-editor-page-attachments.c:130
+#: ../em-format/e-mail-formatter-attachment.c:424
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
+#: ../mail/message-list.etspec.h:4
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Anexo"
+msgstr[1] "Anexos"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:206
+#: ../e-util/e-attachment.c:2542
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Non foi posíbel cargar «%s»"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:208
+#: ../e-util/e-attachment.c:2545
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Non foi posíbel cargar o anexo"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:413
+#, fuzzy
+msgid ""
+"Some attachments are still being downloaded. Please wait until the download "
+"is finished."
+msgstr ""
+"Estanse descargando algúns anexos. Se garda a tarefa fará que se perdan eses "
+"anexos."
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:440
+#, c-format
+msgid "Attachment '%s' cannot be found, remove it from the list, please"
+msgstr ""
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:457
+#, c-format
+msgid "Attachment '%s' doesn't have valid URI, remove it from the list, please"
+msgstr ""
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:618
+#: ../composer/e-composer-actions.c:327
+msgid "_Attachment..."
+msgstr "_Anexo…"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:620
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
+msgid "Attach a file"
+msgstr "Anexar un ficheiro"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:627
+msgid "_Attachments"
+msgstr "_Anexos"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:629
+msgid "Show attachments"
+msgstr "Mostrar anexos"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:781
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
+msgid "Icon View"
+msgstr "Vista de iconas"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:783
+#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
+msgid "List View"
+msgstr "Vista de lista"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:313
+#, c-format
+msgid "Cannot find attendee '%s' in the list of attendees"
+msgstr "Non é posíbel atopar o assistente «%s» na lista de asistentes"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:320
+#, c-format
+msgid "Not enough rights to delete attendee '%s'"
+msgstr "Non ten permisos dabondo para eliminar o asistente «%s»"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:350
+msgid "Failed to delete selected attendee"
+msgid_plural "Failed to delete selected attendees"
+msgstr[0] "Produciuse un erro ao eliminar o asistente seleccionado"
+msgstr[1] "Produciuse un erro ao eliminar os asistentes seleccionados"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:583
+msgid "A_ttendees"
+msgstr "P_articipantes"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:585
+#, fuzzy
+msgid "Toggles whether the Attendees are displayed"
+msgstr "Alterna a vista do campo de tipo de participante"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:594
+msgid "R_ole Field"
+msgstr "Campo da _función"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:596
+msgid "Toggles whether the Role field is displayed"
+msgstr "Alterna a vista do campo da función"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:602
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:604
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Alterna a vista do campo RSVP"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:610
+msgid "_Status Field"
+msgstr "Campo de e_stado"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:612
+msgid "Toggles whether the Status field is displayed"
+msgstr "Alterna a vista do campo de estado"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:618
+msgid "_Type Field"
+msgstr "Campo do _tipo"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:620
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Alterna a vista do campo de tipo de participante"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:945
+msgid "An organizer is required."
+msgstr "Requírese un organizador."
+
+#: ../calendar/gui/e-comp-editor-page-general.c:955
+#: ../calendar/gui/e-comp-editor-page-general.c:1086
+msgid "At least one attendee is required."
+msgstr "Requírese polo menos un participante."
+
+#: ../calendar/gui/e-comp-editor-page-general.c:1209
+msgid "Or_ganizer:"
+msgstr "Or_ganizador:"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:1288
+#, fuzzy
+msgctxt "ECompEditor"
+msgid "Atte_ndees..."
+msgstr "Participa_ntes…"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:326
+msgid "Add exception"
+msgstr "Engadir unha excepción"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:364
+msgid "Modify exception"
+msgstr "Modificar a excepción"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:489
+msgid "on"
+msgstr "en"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:570
+msgctxt "ECompEditorPageRecur"
+msgid "first"
+msgstr "primeiro"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] 
[forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:576
+msgctxt "ECompEditorPageRecur"
+msgid "second"
+msgstr "segundo"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:581
+msgctxt "ECompEditorPageRecur"
+msgid "third"
+msgstr "terceiro"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:586
+msgctxt "ECompEditorPageRecur"
+msgid "fourth"
+msgstr "cuarto"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:591
+msgctxt "ECompEditorPageRecur"
+msgid "fifth"
+msgstr "quinto"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:596
+msgctxt "ECompEditorPageRecur"
+msgid "last"
+msgstr "último"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:623
+msgctxt "ECompEditorPageRecur"
+msgid "Other Date"
+msgstr "Outra data"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:629
+msgctxt "ECompEditorPageRecur"
+msgid "1st to 10th"
+msgstr "Do 1º ao 10º"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:635
+msgctxt "ECompEditorPageRecur"
+msgid "11th to 20th"
+msgstr "do 11º ao 20º"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:641
+msgctxt "ECompEditorPageRecur"
+msgid "21st to 31st"
+msgstr "Do 21º ao 31º"
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:667
+msgctxt "ECompEditorPageRecur"
+msgid "day"
+msgstr "día"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+msgctxt "ECompEditorPageRecur"
+msgid "Monday"
+msgstr "Luns"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+msgctxt "ECompEditorPageRecur"
+msgid "Tuesday"
+msgstr "Martes"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+msgctxt "ECompEditorPageRecur"
+msgid "Wednesday"
+msgstr "Mércores"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+msgctxt "ECompEditorPageRecur"
+msgid "Thursday"
+msgstr "Xoves"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+msgctxt "ECompEditorPageRecur"
+msgid "Friday"
+msgstr "Venres"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+msgctxt "ECompEditorPageRecur"
+msgid "Saturday"
+msgstr "Sábado"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+msgctxt "ECompEditorPageRecur"
+msgid "Sunday"
+msgstr "Domingo"
+
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:803
+msgctxt "ECompEditorPageRecur"
+msgid "on the"
+msgstr "no"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:993
+msgctxt "ECompEditorPageRecur"
+msgid "occurrences"
+msgstr "aparicións"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1486
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2016
+msgctxt "ECompEditorPageRecur"
+msgid "This appointment rec_urs"
+msgstr "Esta cita r_epítese"
+
+#. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1491
+msgctxt "ECompEditorPageRecur"
+msgid "This task rec_urs"
+msgstr "Esta tarefa repítese"
+
+#. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1496
+msgctxt "ECompEditorPageRecur"
+msgid "This memo rec_urs"
+msgstr "Esta nota repítese"
+
+#. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1501
+msgctxt "ECompEditorPageRecur"
+msgid "This component rec_urs"
+msgstr "Este componente r_epítese"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1862
+#, fuzzy
+msgid "Recurrence exception date is invalid"
+msgstr "A data da repetición non é correcta"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1910
+#, fuzzy
+msgid "End time of the recurrence is before the start"
+msgstr ""
+"A hora de finalización da repetición era anterior á do inicio da actividade"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1953
+#, fuzzy
+msgid "R_ecurrence"
+msgstr "Repetición"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1955
+#, fuzzy
+msgid "Set or unset recurrence"
+msgstr "Ten repeticións."
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2056
+msgctxt "ECompEditorPageRecur"
+msgid "Every"
+msgstr "Cada"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2091
+msgctxt "ECompEditorPageRecur"
+msgid "day(s)"
+msgstr "día(s)"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2093
+msgctxt "ECompEditorPageRecur"
+msgid "week(s)"
+msgstr "semana(s)"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2095
+msgctxt "ECompEditorPageRecur"
+msgid "month(s)"
+msgstr "mes(es)"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2097
+msgctxt "ECompEditorPageRecur"
+msgid "year(s)"
+msgstr "ano(s)"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2126
+msgctxt "ECompEditorPageRecur"
+msgid "for"
+msgstr "durante"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2128
+msgctxt "ECompEditorPageRecur"
+msgid "until"
+msgstr "até"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2130
+msgctxt "ECompEditorPageRecur"
+msgid "forever"
+msgstr "indefinidamente"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2146
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Esta cita contén repeticións que o Evolution non pode editar."
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2163
+msgid "Exceptions"
+msgstr "Excepcións"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1778
+#: ../mail/mail-config.ui.h:62
+msgid "A_dd"
+msgstr "Enga_dir"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2248
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1786
+#: ../mail/mail-config.ui.h:64
+msgid "Re_move"
+msgstr "E_liminar"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2256
+msgid "Preview"
+msgstr "Vista previa"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:41
+msgid "Send To"
+msgstr "Enviar a"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1555
+msgid "_Reminders"
+msgstr "_Recordatorios"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1557
+#, fuzzy
+msgid "Set or unset reminders"
+msgstr "Estabelcer ou desestabelecer os recordatorios desta actividade"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1610
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "Reminders"
+msgstr "Recordatorios"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1639
+msgid "_Reminder"
+msgstr "_Recordatorio"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1672
+#, c-format
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "%d día antes da cita"
+msgstr[1] "%d días antes da cita"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1679
+#, c-format
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "%d hora antes da cita"
+msgstr[1] "%d horas antes da cita"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1686
+#, c-format
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "%d minuto antes da cita"
+msgstr[1] "%d minutos antes da cita"
+
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1694
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "Ningunha"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1696
+msgctxt "cal-reminders"
+msgid "15 minutes before"
+msgstr "15 minutos antes"
+
+# (pofilter) variables: (u'translation contains variables not in original: %d',)
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1698
+msgctxt "cal-reminders"
+msgid "1 hour before"
+msgstr "1 hora antes"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1700
+msgctxt "cal-reminders"
+msgid "1 day before"
+msgstr "1 día antes"
+
+#. Translators: "Custom" for "Custom reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1712
+msgctxt "cal-reminders"
+msgid "Custom"
+msgstr "Personalizado"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1863
+msgctxt "cal-reminders"
+msgid "minute(s)"
+msgstr "minuto(s)"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1865
+msgctxt "cal-reminders"
+msgid "hour(s)"
+msgstr "hora(s)"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1867
+msgctxt "cal-reminders"
+msgid "day(s)"
+msgstr "día(s)"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1884
+msgctxt "cal-reminders"
+msgid "before"
+msgstr "antes"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1886
+msgctxt "cal-reminders"
+msgid "after"
+msgstr "despois"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1902
+msgctxt "cal-reminders"
+msgid "start"
+msgstr "inicio"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1904
+msgctxt "cal-reminders"
+msgid "end"
+msgstr "final"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1927
+msgid "Re_peat the reminder"
+msgstr "_Repetir o recordatorio"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1952
+msgctxt "cal-reminders"
+msgid "extra times every"
+msgstr "veces adicionais cada"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1989
+msgctxt "cal-reminders"
+msgid "minutes"
+msgstr "minutos"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1991
+msgctxt "cal-reminders"
+msgid "hours"
+msgstr "horas"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1993
+msgctxt "cal-reminders"
+msgid "days"
+msgstr "días"
+
+#. page_reminders->priv->custom_email_entry is initialized on demand
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2034
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2191
+msgctxt "cal-reminders"
+msgid "Custom _message"
+msgstr "_Mensaxe personalizada"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2078
+msgctxt "cal-reminders"
+msgid "Custom reminder _sound"
+msgstr "_Son de recordatorio personalizado"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2089
+msgid "Select a sound file"
+msgstr "Seleccionar un ficheiro de son"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2117
+msgid "_Program:"
+msgstr "_Programa:"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2142
+msgid "_Arguments:"
+msgstr "_Argumentos:"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2174
+msgid "_Send To:"
+msgstr "_Enviar a:"
+
+#: ../calendar/gui/e-comp-editor-page-schedule.c:427
+msgid "_Schedule"
+msgstr "_Planificar"
+
+#: ../calendar/gui/e-comp-editor-page-schedule.c:429
+msgid "Query free / busy information for the attendees"
+msgstr "Consultar a información de dispoñibilidade para os participantes"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:81
+msgctxt "ECompEditor"
+msgid "_Summary:"
+msgstr "_Resumo:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:325
+msgctxt "ECompEditor"
+msgid "_Location:"
+msgstr "_Localización:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:458
+msgctxt "ECompEditor"
+msgid "_Categories..."
+msgstr "Ca_tegorías…"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:555
+msgctxt "ECompEditor"
+msgid "_Description:"
+msgstr "_Descrición:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:686
+msgctxt "ECompEditor"
+msgid "_Web page:"
+msgstr "Páxina _Web:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1057
+msgctxt "ECompEditor"
+msgid "D_ue date:"
+msgstr "D_ata de vencemento:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1117
+msgctxt "ECompEditor"
+msgid "Date _completed:"
+msgstr "Data _completada:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1133
+msgctxt "ECompEditor"
+msgid "Public"
+msgstr "Público"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1134
+msgctxt "ECompEditor"
+msgid "Private"
+msgstr "Privado"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1135
+msgctxt "ECompEditor"
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1151
+msgctxt "ECompEditor"
+msgid "C_lassification:"
+msgstr "C_lasificación:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1170
+msgctxt "ECompEditor"
+msgid "Not Started"
+msgstr "Non iniciada"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1171
+msgctxt "ECompEditor"
+msgid "In Progress"
+msgstr "En progreso"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1172
+msgctxt "ECompEditor"
+msgid "Completed"
+msgstr "Completada"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1173
+msgctxt "ECompEditor"
+msgid "Canceled"
+msgstr "Cancelada"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1182
+msgctxt "ECompEditor"
+msgid "_Status:"
+msgstr "_Estado:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1212
+msgctxt "ECompEditor"
+msgid "Undefined"
+msgstr "Sen definir"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1213
+msgctxt "ECompEditor"
+msgid "High"
+msgstr "Alta"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1214
+msgctxt "ECompEditor"
+msgid "Normal"
+msgstr "Normal"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1215
+msgctxt "ECompEditor"
+msgid "Low"
+msgstr "Baixa"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1224
+msgctxt "ECompEditor"
+msgid "Priorit_y:"
+msgstr "Priorida_de:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1278
+msgctxt "ECompEditor"
+msgid "Percent complete:"
+msgstr "_Porcentaxe completada:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1359
+msgctxt "ECompEditor"
+msgid "Time _zone:"
+msgstr "Fuso _horario:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1484
+msgctxt "ECompEditor"
+msgid "Show time as _busy"
+msgstr "Mostrar a hora como oc_upada"
+
+#: ../calendar/gui/e-comp-editor-task.c:75
+msgid "Task's start date is in the past"
+msgstr "A data de inicio da tarefa xa pasou"
+
+#: ../calendar/gui/e-comp-editor-task.c:83
+msgid "Task's due date is in the past"
+msgstr "A data de vencemento da tarefa xa pasou"
+
+#: ../calendar/gui/e-comp-editor-task.c:308
+msgid ""
+"Task cannot be edited, because the selected task list could not be opened"
+msgstr ""
+"Non é posíbel editar a tarefa porque a lista de tarefas seleccionada non se "
+"pode abrir"
+
+#: ../calendar/gui/e-comp-editor-task.c:310
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr ""
+"Non é posíbel editar a tarefa porque a lista de tarefas seleccionada é de só "
+"lectura"
+
+#: ../calendar/gui/e-comp-editor-task.c:312
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr ""
+"Non é posíbel editar a tarefa na súa totalidade porque vostede non é o "
+"organizador"
+
+#: ../calendar/gui/e-comp-editor-task.c:359
+msgid "Due date is not a valid date"
+msgstr "A data da vencemento non é unha data válida"
+
+#: ../calendar/gui/e-comp-editor-task.c:370
+msgid "Completed date is not a valid date"
+msgstr "A data de conclusión non vé unha data válida"
+
+# (pofilter) variables: (u'translation contains variables not in original: %d',)
+#: ../calendar/gui/e-comp-editor-task.c:381
+msgid "Completed date cannot be in the future"
+msgstr "A data de conclusion non pode estar no futuro"
+
+#: ../calendar/gui/e-comp-editor-task.c:566
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tarefa asignada - %s"
+
+#: ../calendar/gui/e-comp-editor-task.c:567
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
+
+#: ../calendar/gui/e-comp-editor.c:254
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
+msgid "attachment"
+msgstr "anexo"
+
+#: ../calendar/gui/e-comp-editor.c:609
+msgid "Sending notifications to attendees..."
+msgstr "Enviando notificacións aos participantes…"
+
+#: ../calendar/gui/e-comp-editor.c:991
+msgid "Saving changes..."
+msgstr "Gardando os cambios…"
+
+#: ../calendar/gui/e-comp-editor.c:1247
+msgid "No Summary"
+msgstr "Sen resumo"
+
+#. == Button box ==
+#: ../calendar/gui/e-comp-editor.c:1972 ../composer/e-composer-actions.c:334
+#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:295
+#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:391
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
+#: ../mail/e-mail-notes.c:903 ../mail/em-folder-properties.c:688
+#: ../mail/em-subscription-editor.c:1759
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
+#: ../smime/gui/certificate-manager.c:2068
+msgid "_Close"
+msgstr "_Pechar"
+
+#: ../calendar/gui/e-comp-editor.c:1974
+msgid "Close the current window"
+msgstr "Pechar a xanela actual"
+
+#. copy menu item
+#: ../calendar/gui/e-comp-editor.c:1979 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
+#: ../e-util/e-web-view.c:379 ../mail/e-mail-browser.c:136
+#: ../mail/mail.error.xml.h:140 ../shell/e-shell-window-actions.c:799
+msgid "_Copy"
+msgstr "_Copiar…"
+
+#: ../calendar/gui/e-comp-editor.c:1981 ../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:381
+#: ../e-util/e-web-view.c:1420 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:801
+msgid "Copy the selection"
+msgstr "Copiar a selección"
+
+#. cut menu item
+#: ../calendar/gui/e-comp-editor.c:1986 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
+#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: ../calendar/gui/e-comp-editor.c:1988 ../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:1414
+#: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
+msgid "Cut the selection"
+msgstr "Cortar a selección"
+
+#: ../calendar/gui/e-comp-editor.c:1995 ../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:815
+msgid "Delete the selection"
+msgstr "Eliminar a selección"
+
+#: ../calendar/gui/e-comp-editor.c:2002
+msgid "View help"
+msgstr "Ver a axuda"
+
+#. paste menu item
+#: ../calendar/gui/e-comp-editor.c:2007 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
+#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
+msgid "_Paste"
+msgstr "_Pegar"
+
+#: ../calendar/gui/e-comp-editor.c:2009 ../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:1426
+#: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
+msgid "Paste the clipboard"
+msgstr "Pegar o contido do portapapeis"
+
+#: ../calendar/gui/e-comp-editor.c:2014 ../composer/e-composer-actions.c:388
+#: ../mail/e-mail-reader.c:2287
+#: ../modules/addressbook/e-book-shell-view-actions.c:1231
+#: ../modules/addressbook/e-book-shell-view-actions.c:1245
+msgid "_Print..."
+msgstr "_Imprimir…"
+
+#: ../calendar/gui/e-comp-editor.c:2021 ../mail/e-mail-reader.c:2294
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
+msgid "Pre_view..."
+msgstr "Previsuliazar…"
+
+#: ../calendar/gui/e-comp-editor.c:2028 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:389
+#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
+msgid "Select _All"
+msgstr "Seleccionar _todo"
+
+#: ../calendar/gui/e-comp-editor.c:2030 ../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:159 ../shell/e-shell-window-actions.c:913
+msgid "Select all text"
+msgstr "Seleccionar todo o texto"
+
+#: ../calendar/gui/e-comp-editor.c:2051
+msgid "_Classification"
+msgstr "_Clasificación"
+
+#: ../calendar/gui/e-comp-editor.c:2065 ../e-util/e-html-editor-actions.c:1127
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:166
+#: ../mail/e-mail-notes.c:917 ../shell/e-shell-window-actions.c:948
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: ../calendar/gui/e-comp-editor.c:2079 ../e-util/e-html-editor-actions.c:1148
+msgid "_Insert"
+msgstr "_Inserir"
+
+#: ../calendar/gui/e-comp-editor.c:2086 ../composer/e-composer-actions.c:378
+msgid "_Options"
+msgstr "_Opcións"
+
+#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1169
+#: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
+#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
+msgid "_View"
+msgstr "_Vista"
+
+#: ../calendar/gui/e-comp-editor.c:2105
+msgid "Save current changes"
+msgstr "Gardar os cambios actuais"
+
+#: ../calendar/gui/e-comp-editor.c:2110 ../e-util/e-mail-signature-editor.c:304
+#: ../mail/e-mail-notes.c:912
+msgid "Save and Close"
+msgstr "Gardar e pechar"
+
+#: ../calendar/gui/e-comp-editor.c:2112
+msgid "Save current changes and close editor"
+msgstr "Gardar os cambios actuais e pechar o editor"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2138 ../calendar/gui/e-week-view.c:1694
-#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
+#: ../calendar/gui/e-day-view.c:2132 ../calendar/gui/e-week-view.c:1728
+#: ../calendar/gui/print.c:1072 ../calendar/gui/print.c:1091
+#: ../calendar/gui/print.c:2628 ../calendar/gui/print.c:2648
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2141 ../calendar/gui/e-week-view.c:1697
-#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
+#: ../calendar/gui/e-day-view.c:2135 ../calendar/gui/e-week-view.c:1731
+#: ../calendar/gui/print.c:1077 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2650
 msgid "pm"
 msgstr "pm"
 
@@ -4942,13 +4998,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:3019 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:3017 ../calendar/gui/e-day-view-top-item.c:843
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2095
 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:3744
+#: ../calendar/gui/e-day-view.c:3742
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -4959,27 +5015,27 @@ msgstr "Semana %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:804
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "divisións de %02i minutos"
 
-#: ../calendar/gui/e-day-view-time-item.c:829
+#: ../calendar/gui/e-day-view-time-item.c:831
 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:846
-#: ../modules/calendar/e-calendar-preferences.c:308
-#: ../modules/calendar/e-calendar-preferences.c:360
+#: ../calendar/gui/e-day-view-time-item.c:848
+#: ../modules/calendar/e-calendar-preferences.c:303
+#: ../modules/calendar/e-calendar-preferences.c:355
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ningunha"
 
-#: ../calendar/gui/e-day-view-time-item.c:880
+#: ../calendar/gui/e-day-view-time-item.c:882
 #: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:391
+#: ../modules/calendar/e-calendar-preferences.c:386
 msgid "Select..."
 msgstr "Seleccionar…"
 
@@ -4999,51 +5055,55 @@ msgstr "Participantes opcionais"
 msgid "Resources"
 msgstr "Recursos"
 
+#: ../calendar/gui/e-meeting-list-view.c:164
+msgid "Attendees"
+msgstr "Participantes"
+
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
-#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
+#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1245
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
+#: ../calendar/gui/print.c:1246 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/print.c:1263
+#: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:195
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
+#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1263
 msgid "Required Participant"
 msgstr "Participante necesario"
 
 #: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1265
+#: ../calendar/gui/print.c:1264
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "Non-participante"
 
@@ -5053,11 +5113,20 @@ msgstr "Non-participante"
 msgid "Needs Action"
 msgstr "Necesita unha acción"
 
-#: ../calendar/gui/e-meeting-list-view.c:644
+#: ../calendar/gui/e-meeting-list-view.c:619
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:699
+#: ../calendar/gui/e-meeting-list-view.c:645
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-task-table.etspec.h:3
+#: ../e-util/e-attachment-tree-view.c:591
+#: ../mail/e-mail-account-tree-view.c:157
+msgid "Type"
+msgstr "Tipo"
+
+#: ../calendar/gui/e-meeting-list-view.c:674
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
@@ -5092,59 +5161,63 @@ msgstr "Ausente da oficina"
 msgid "No Information"
 msgstr "Sen información"
 
+#: ../calendar/gui/e-meeting-time-sel.c:555
+msgid "Atte_ndees..."
+msgstr "Participa_ntes…"
+
 #: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:594
+#: ../calendar/gui/e-meeting-time-sel.c:595
 msgid "Show _only working hours"
 msgstr "Mostrar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:625
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_Update free/busy"
 msgstr "Act_ualizar a dispoñibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:662
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "Seleccionar _automaticamente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:679
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:700
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "_All people and resources"
 msgstr "Tod_as as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:711
+#: ../calendar/gui/e-meeting-time-sel.c:713
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:722
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "_Required people"
 msgstr "Persoas necesa_rias"
 
-#: ../calendar/gui/e-meeting-time-sel.c:732
+#: ../calendar/gui/e-meeting-time-sel.c:734
 msgid "Required people and _one resource"
 msgstr "Pers_oas necesarias e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:771
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:800
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2721
+#: ../calendar/gui/e-meeting-time-sel.c:2727
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5153,7 +5226,7 @@ msgstr ""
 "Resumo: %s\n"
 "Localización: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2723 ../calendar/gui/print.c:3516
+#: ../calendar/gui/e-meeting-time-sel.c:2729 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
@@ -5182,46 +5255,46 @@ msgstr "Nome común"
 msgid "Language"
 msgstr "Idioma"
 
-#: ../calendar/gui/e-memo-table.c:371
-#: ../modules/calendar/e-cal-shell-content.c:1599
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-#: ../modules/calendar/e-memo-shell-view.c:308
+#: ../calendar/gui/e-memo-table.c:370
+#: ../modules/calendar/e-cal-shell-content.c:1667
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view.c:315
 msgid "Memos"
 msgstr "Notas"
 
-#: ../calendar/gui/e-memo-table.c:455 ../calendar/gui/e-task-table.c:757
+#: ../calendar/gui/e-memo-table.c:454 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr "* Sen resumo *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:540 ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-memo-table.c:539 ../calendar/gui/e-task-table.c:839
 msgid "Start: "
 msgstr "Inicio: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:560 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:559 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Vencemento: "
 
-#: ../calendar/gui/e-memo-table.c:683
+#: ../calendar/gui/e-memo-table.c:682
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar as notas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:689
+#: ../calendar/gui/e-memo-table.c:688
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar as notas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:695
+#: ../calendar/gui/e-memo-table.c:694
 msgid "Paste memos from the clipboard"
 msgstr "Pegar as notas desde o portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:701
-#: ../modules/calendar/e-memo-shell-view-actions.c:531
+#: ../calendar/gui/e-memo-table.c:700
+#: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "Eliminar as notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:706
 msgid "Select all visible memos"
 msgstr "Seleccionar todas as notas visíbeis"
 
@@ -5229,6 +5302,11 @@ msgstr "Seleccionar todas as notas visíbeis"
 msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
+#: ../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"
+
 #. Translators: "%d%%" is the percentage of a task done.
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
@@ -5238,14 +5316,14 @@ msgstr "Prema para engadir unha nota"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
-#: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1062
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
-#: ../modules/calendar/e-cal-shell-content.c:1559
-#: ../modules/calendar/e-task-shell-view-actions.c:203
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-#: ../modules/calendar/e-task-shell-view.c:466
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1117
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-cal-shell-content.c:1627
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view.c:473
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -5262,7 +5340,7 @@ msgid "Paste tasks from the clipboard"
 msgstr "Pegar as tarefas desde o portapapeis"
 
 #: ../calendar/gui/e-task-table.c:1016
-#: ../modules/calendar/e-task-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "Eliminar as tarefas seleccionadas"
 
@@ -5270,6 +5348,36 @@ msgstr "Eliminar as tarefas seleccionadas"
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas as tarefas visíbeis"
 
+#: ../calendar/gui/e-task-table.etspec.h:1
+msgid "Click to add a task"
+msgstr "Prema para engadir unha tarefa"
+
+#: ../calendar/gui/e-task-table.etspec.h:2
+msgid "Start date"
+msgstr "Data de inicio"
+
+#: ../calendar/gui/e-task-table.etspec.h:5
+msgid "Completion date"
+msgstr "Data de conclusión"
+
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:965
+msgid "Complete"
+msgstr "Completado"
+
+#: ../calendar/gui/e-task-table.etspec.h:7
+msgid "Due date"
+msgstr "Data de vencemento"
+
+#: ../calendar/gui/e-task-table.etspec.h:9
+#, no-c-format
+msgid "% Complete"
+msgstr "% completado"
+
+#: ../calendar/gui/e-task-table.etspec.h:10 ../calendar/gui/tasktypes.xml.h:18
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Priority"
+msgstr "Prioridade"
+
 #: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Seleccionar un fuso horario"
@@ -5278,36 +5386,36 @@ 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:224 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2074
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:842
 msgid "An organizer must be set."
 msgstr "Debe estabelecerse un organizador."
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:699
 msgid "At least one attendee is necessary"
 msgstr "É necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:930 ../calendar/gui/itip-utils.c:1091
 msgid "Event information"
 msgstr "Información da actividade"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
 msgid "Task information"
 msgstr "Información da tarefa"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
+#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
 msgid "Memo information"
 msgstr "Información da nota"
 
-#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
+#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
 msgid "Free/Busy information"
 msgstr "Información de dispoñibilidade"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:942
 msgid "Calendar information"
 msgstr "Información do calendario"
 
@@ -5315,7 +5423,7 @@ msgstr "Información do calendario"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:979
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -5324,7 +5432,7 @@ msgstr "Aceptado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:985
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -5336,7 +5444,7 @@ msgstr "Aceptado provisionalmente"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
+#: ../calendar/gui/itip-utils.c:993 ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rexeitado"
@@ -5345,7 +5453,7 @@ msgstr "Rexeitado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:999
+#: ../calendar/gui/itip-utils.c:1000
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -5353,7 +5461,7 @@ msgstr "Delegado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1012
+#: ../calendar/gui/itip-utils.c:1013
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -5361,7 +5469,7 @@ msgstr "Actualizado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1019
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -5369,7 +5477,7 @@ msgstr "Cancelar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1026
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -5377,168 +5485,168 @@ msgstr "Actualizar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1033
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:1111
+#: ../calendar/gui/itip-utils.c:1112
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de dispoñibilidade (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:1119
+#: ../calendar/gui/itip-utils.c:1120
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1148
+#: ../calendar/gui/itip-utils.c:1149
 #, 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:1153
+#: ../calendar/gui/itip-utils.c:1154
 msgid "Unable to book a resource, error: "
 msgstr "Non foi posíbel reservar un recurso, erro:"
 
-#: ../calendar/gui/itip-utils.c:1324
+#: ../calendar/gui/itip-utils.c:1325
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante na actividade."
 
-#: ../calendar/gui/itip-utils.c:1918
+#: ../calendar/gui/itip-utils.c:1933
 msgid "Sending an event"
 msgstr "Enviando un evento"
 
-#: ../calendar/gui/itip-utils.c:1922
+#: ../calendar/gui/itip-utils.c:1937
 msgid "Sending a memo"
 msgstr "Enviando un recordatorio"
 
-#: ../calendar/gui/itip-utils.c:1926
+#: ../calendar/gui/itip-utils.c:1941
 msgid "Sending a task"
 msgstr "Enviando unha tarefa"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:670
+#: ../calendar/gui/print.c:669
 msgid "31st"
 msgstr "31"
 
@@ -5546,102 +5654,114 @@ msgstr "31"
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:729
 msgid "Mo"
 msgstr "Lu"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:730
 msgid "Tu"
 msgstr "Ma"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:731
 msgid "We"
 msgstr "Mé"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:733
+#: ../calendar/gui/print.c:732
 msgid "Th"
 msgstr "Xo"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:734
+#: ../calendar/gui/print.c:733
 msgid "Fr"
 msgstr "Ve"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:734
 msgid "Sa"
 msgstr "Sá"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:735
 msgid "Su"
 msgstr "Do"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3309
+#: ../calendar/gui/print.c:3315
 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:3319
+#: ../calendar/gui/print.c:3325
 msgid " (Completed "
 msgstr " (Completado "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3325
+#: ../calendar/gui/print.c:3331
 msgid "Completed "
 msgstr "Completado "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3341
 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:3342
+#: ../calendar/gui/print.c:3348
 msgid "Due "
 msgstr "Vencemento "
 
-#: ../calendar/gui/print.c:3546
+#: ../calendar/gui/print.c:3492
+msgid "Appointment"
+msgstr "Cita"
+
+#: ../calendar/gui/print.c:3494 ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "Tarefa"
+
+#: ../calendar/gui/print.c:3496
+msgid "Memo"
+msgstr "Nota"
+
+#: ../calendar/gui/print.c:3552
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:3590
+#: ../calendar/gui/print.c:3596
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:3606
+#: ../calendar/gui/print.c:3612
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:3624
+#: ../calendar/gui/print.c:3630
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:3638
+#: ../calendar/gui/print.c:3644
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3652
+#: ../calendar/gui/print.c:3658
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:3663
+#: ../calendar/gui/print.c:3669
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -5664,185 +5784,205 @@ msgstr "é maior que"
 msgid "is less than"
 msgstr "é menor que"
 
-#: ../calendar/importers/icalendar-importer.c:77
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "Citas e reunións"
 
-#: ../calendar/importers/icalendar-importer.c:452
-#: ../calendar/importers/icalendar-importer.c:891
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../modules/calendar/e-cal-base-shell-backend.c:183
+#: ../modules/calendar/e-cal-shell-view-actions.c:180
+msgid "New Calendar"
+msgstr "Calendario novo"
+
+#: ../calendar/importers/icalendar-importer.c:315
+#: ../modules/calendar/e-cal-base-shell-backend.c:191
+#: ../modules/calendar/e-task-shell-view-actions.c:204
+msgid "New Task List"
+msgstr "Lista de tarefas nova"
+
+#: ../calendar/importers/icalendar-importer.c:357
+msgid "Cre_ate new calendar"
+msgstr "Cre_ar un calendario novo"
+
+#: ../calendar/importers/icalendar-importer.c:361
+msgid "Cre_ate new task list"
+msgstr "Cre_ar unha lista de tarefas nova"
+
+#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "Abrindo o calendario"
 
-#: ../calendar/importers/icalendar-importer.c:600
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "iCalendar files (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:601
+#: ../calendar/importers/icalendar-importer.c:656
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:693
+#: ../calendar/importers/icalendar-importer.c:748
 msgid "Reminder!"
 msgstr "Aviso"
 
-#: ../calendar/importers/icalendar-importer.c:777
+#: ../calendar/importers/icalendar-importer.c:832
 msgid "vCalendar files (.vcs)"
 msgstr "Ficheiros vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:778
+#: ../calendar/importers/icalendar-importer.c:833
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../calendar/importers/icalendar-importer.c:1110
 msgid "Calendar Events"
 msgstr "Actividades do calendario"
 
-#: ../calendar/importers/icalendar-importer.c:1098
-msgid "Gnome Calendar"
-msgstr "Calendario do GNOME"
+#: ../calendar/importers/icalendar-importer.c:1153
+msgid "GNOME Calendar"
+msgstr "Calendario de GNOME"
 
-#: ../calendar/importers/icalendar-importer.c:1099
+#: ../calendar/importers/icalendar-importer.c:1154
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intelixente do calendario do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:1170
-#: ../calendar/importers/icalendar-importer.c:1484
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Reunión"
 
-#: ../calendar/importers/icalendar-importer.c:1170
-#: ../calendar/importers/icalendar-importer.c:1484
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Actividade"
 
-#: ../calendar/importers/icalendar-importer.c:1173
-#: ../calendar/importers/icalendar-importer.c:1485
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/importers/icalendar-importer.c:1176
-#: ../calendar/importers/icalendar-importer.c:1486
+#: ../calendar/importers/icalendar-importer.c:1231
+#: ../calendar/importers/icalendar-importer.c:1541
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/importers/icalendar-importer.c:1185
+#: ../calendar/importers/icalendar-importer.c:1240
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ten repeticións"
 
-#: ../calendar/importers/icalendar-importer.c:1190
+#: ../calendar/importers/icalendar-importer.c:1245
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "é unha instancia"
 
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1250
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "Ten recordatorios"
 
-#: ../calendar/importers/icalendar-importer.c:1200
+#: ../calendar/importers/icalendar-importer.c:1255
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ten anexos"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1213
+#: ../calendar/importers/icalendar-importer.c:1268
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Público"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1216
+#: ../calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privado"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1219
+#: ../calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidencial"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1223
+#: ../calendar/importers/icalendar-importer.c:1278
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Clasificación"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1228
-#: ../calendar/importers/icalendar-importer.c:1528
+#: ../calendar/importers/icalendar-importer.c:1283
+#: ../calendar/importers/icalendar-importer.c:1583
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Resumo"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1234
+#: ../calendar/importers/icalendar-importer.c:1289
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Localización"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1242
-#: ../calendar/importers/icalendar-importer.c:1523
+#: ../calendar/importers/icalendar-importer.c:1297
+#: ../calendar/importers/icalendar-importer.c:1578
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Inicio"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1253
+#: ../calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Vencemento"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1265
+#: ../calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Final"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1330
 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:1299
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completada"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1307
+#: ../calendar/importers/icalendar-importer.c:1362
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1318
-#: ../calendar/importers/icalendar-importer.c:1321
+#: ../calendar/importers/icalendar-importer.c:1373
+#: ../calendar/importers/icalendar-importer.c:1376
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizador"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1341
-#: ../calendar/importers/icalendar-importer.c:1344
+#: ../calendar/importers/icalendar-importer.c:1396
+#: ../calendar/importers/icalendar-importer.c:1399
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/importers/icalendar-importer.c:1358
+#: ../calendar/importers/icalendar-importer.c:1413
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Descrición"
 
-#: ../calendar/importers/icalendar-importer.c:1518
+#: ../calendar/importers/icalendar-importer.c:1573
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tipo"
@@ -7414,7 +7554,7 @@ msgstr "_Mensaxe nova"
 msgid "Open New Message window"
 msgstr "Abrir unha xanela de mensaxe nova"
 
-#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1208
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1216
 #: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "_Preferencias"
@@ -7517,13 +7657,13 @@ msgstr "Asinar esta mensaxe co seu certificado de sinatura S/MIME"
 
 #: ../composer/e-composer-actions.c:523
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-msgid "Unicode smileys"
-msgstr "Sorrisos Unicode"
+msgid "Unicode emoticons"
+msgstr "Emoticonos de Unicode"
 
 #: ../composer/e-composer-actions.c:525
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid "Use Unicode characters for smileys."
-msgstr "Usar caracteres Unicode para os sorrisos."
+msgid "Use Unicode characters for emoticons."
+msgstr "Usar caracteres Unicode para os emoticonos."
 
 #: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
@@ -7559,6 +7699,10 @@ msgstr "Campo _Responder a"
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna a vista do campo «Responder a»"
 
+#: ../composer/e-composer-actions.c:612
+msgid "Attach"
+msgstr "Anexar"
+
 #: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr "Gardar o borrador"
@@ -7566,8 +7710,8 @@ msgstr "Gardar o borrador"
 #: ../composer/e-composer-from-header.c:109
 #: ../e-util/e-mail-signature-script-dialog.c:415
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:319
-#: ../mail/e-mail-config-summary-page.c:331
+#: ../mail/e-mail-config-identity-page.c:323
+#: ../mail/e-mail-config-summary-page.c:332
 msgid "_Name:"
 msgstr "_Nome:"
 
@@ -7616,7 +7760,7 @@ msgid "S_ubject:"
 msgstr "_Asunto:"
 
 #: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:504
+#: ../mail/e-mail-config-identity-page.c:516
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
@@ -7628,7 +7772,7 @@ msgstr "Premer aquí para ir á axenda de enderezos"
 msgid "Click here to select folders to post to"
 msgstr "Premer aquí para seleccionar os cartafoles de destino"
 
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:874
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7636,7 +7780,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:881
+#: ../composer/e-msg-composer.c:883
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7645,11 +7789,11 @@ msgstr ""
 "Non é posíbel cifrar a mensaxe saínte: non hai un certificado de cifrado "
 "estabelecido para esta conta"
 
-#: ../composer/e-msg-composer.c:1595 ../composer/e-msg-composer.c:2367
+#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2645
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4710
+#: ../composer/e-msg-composer.c:4995
 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."
@@ -7700,18 +7844,6 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Produciuse un erro ao gardar automaticamente debido a «{1}»."
 
 #: ../composer/mail-composer.error.xml.h:11
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "Hai unha descarga en progreso. Desexa enviar o correo?"
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-" Hai algúns anexos descargándose. Enviar o correo agora fará que se envíe "
-"sen eses anexos pendentes "
-
-#: ../composer/mail-composer.error.xml.h:14
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -7719,7 +7851,7 @@ msgstr ""
 "Está seguro de que desexa rexeitar a mensaxe que está redactando titulada "
 "«{0}»?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:12
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -7730,83 +7862,83 @@ msgstr ""
 "permitiralle continuar coa redacción da mensaxe máis tarde."
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:15
 msgid "_Continue Editing"
 msgstr "_Continuar a edición"
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 msgid "_Save Draft"
 msgstr "_Gardar o borrador"
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:17
 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
+#: ../composer/mail-composer.error.xml.h:18
 msgid "Could not create message."
 msgstr "Non foi posíbel crear a mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:19
 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:23
+#: ../composer/mail-composer.error.xml.h:20
 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:24
+#: ../composer/mail-composer.error.xml.h:21
 msgid "All accounts have been removed."
 msgstr "Retiráronse todas as contas."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:22
 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:26
+#: ../composer/mail-composer.error.xml.h:23
 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:27
+#: ../composer/mail-composer.error.xml.h:24
 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:28
+#: ../composer/mail-composer.error.xml.h:25
 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:29
+#: ../composer/mail-composer.error.xml.h:26
 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:30
+#: ../composer/mail-composer.error.xml.h:27
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Produciuse un erro ao enviar. Que desexa facer?"
 
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:170
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:169
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "O informe de erro foi «{0}»."
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Save to Outbox"
 msgstr "Gardar na caixa de _saída"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Try Again"
 msgstr "Tentar outra vez"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:31
 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:35
+#: ../composer/mail-composer.error.xml.h:32
 msgid "Saving message to Outbox."
 msgstr "Gardando a mensaxe no cartafol de saída."
 
-#: ../composer/mail-composer.error.xml.h:36
+#: ../composer/mail-composer.error.xml.h:33
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -7816,11 +7948,11 @@ 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
+#: ../composer/mail-composer.error.xml.h:34
 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
+#: ../composer/mail-composer.error.xml.h:35
 msgid ""
 "A keyboard accelerator to send the message has been pressed. Either cancel "
 "sending the message, if it was done by an accident, or send the message."
@@ -7829,11 +7961,11 @@ msgstr ""
 "envío do mensaxe, no caso de que fora premido por accidente, ou enviar o "
 "mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:39
+#: ../composer/mail-composer.error.xml.h:37
 msgid "Are you sure you want to change the composer mode?"
 msgstr "Está seguro de que desexa cambiar o modo de composición?"
 
-#: ../composer/mail-composer.error.xml.h:40
+#: ../composer/mail-composer.error.xml.h:38
 msgid ""
 "Turning HTML mode off will cause the text to lose all formatting. Do you "
 "want to continue?"
@@ -7841,11 +7973,11 @@ msgstr ""
 "Desactivar o modo HTML causará que o texto perda todo o formatado. Desexa "
 "continuar?"
 
-#: ../composer/mail-composer.error.xml.h:41
+#: ../composer/mail-composer.error.xml.h:39
 msgid "_Don't lose formatting"
 msgstr "_Non perder o formatado"
 
-#: ../composer/mail-composer.error.xml.h:42
+#: ../composer/mail-composer.error.xml.h:40
 msgid "Lose _formatting"
 msgstr "_Perder formatado"
 
@@ -7857,7 +7989,8 @@ msgstr "Notificador de alarmas do Evolution"
 msgid "Calendar event notifications"
 msgstr "Notificacións de actividades do calendario"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1092
+#: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
+#: ../mail/e-mail-browser.c:1118
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -7871,7 +8004,7 @@ msgstr "Suite de Groupware"
 msgid "Evolution Mail and Calendar"
 msgstr "Correo e calendario do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:4
+#: ../data/evolution.desktop.in.in.h:4 ../evolution.appdata.xml.in.h:2
 msgid "Manage your email, contacts and schedule"
 msgstr "Xestione o seu correo, contactos e programación"
 
@@ -7879,6 +8012,10 @@ msgstr "Xestione o seu correo, contactos e programación"
 msgid "email;calendar;contact;addressbook;task;"
 msgstr "correo;calendario;contacto;caderno de enderezos;tarefas;"
 
+#: ../data/evolution.desktop.in.in.h:6
+msgid "New Window"
+msgstr "_Xanela nova"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "Activar formatado de enderezos"
@@ -8608,56 +8745,67 @@ msgstr ""
 "semanais e mensuais"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+msgid "Show appointment icons in the month view"
+msgstr "Mostrar as iconas das citas na vista semanal"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#, fuzzy
+msgid "Whether to show icons of events in the month view"
+msgstr ""
+"Indica se se mostra a hora de finalización das actividades nas vistas "
+"semanais e mensuais"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the memo preview pane"
 msgstr "Mostrar o panel de vista previa de notas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr ""
 "Se é verdadeiro, móstrase o panel de vista previa das notas na xanela "
 "principal"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show the task preview pane"
 msgstr "Mostrar o panel de vista previa de tarefas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr ""
 "Se é verdadeiro, móstrase o panel de vista previa de tarefas na xanela "
 "principal"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 "Mostrar os números das semanas na vista diaria, de semana laboral e no "
 "navegador de datas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr ""
 "Indica se se mostran os números de semana en diferentes lugares do calendario"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Vertical position for the tag pane"
 msgstr "Posición vertical do panel de etiquetas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Highlight tasks due today"
 msgstr "Realce das tarefas que vencen hoxe"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "Indica se realzar as tarefas que vencen hoxe con unha cor especial (task-"
 "overdue-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Tasks due today color"
 msgstr "Cor para as tarefas que vencen hoxe"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8665,15 +8813,15 @@ msgstr ""
 "Cor de fondo para as tarefas que vencen hoxe, no formato «#rrggbb». Usado "
 "xunto ao realce de tarefas que vencen hoxe."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Task preview pane position (horizontal)"
 msgstr "Posición do panel de vista previa de tarefas (horizontal)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task layout style"
 msgstr "Estilo da disposición de tarefas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -8684,21 +8832,21 @@ msgstr ""
 "previa embaixo da lista de tarefas. «1» (vista vertical) mostra o panel de "
 "vista previa ao lado da lista de tarefas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Task preview pane position (vertical)"
 msgstr "Posición do panel de vista previa de tarefas (vertical)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 msgid "Position of the task preview pane when oriented vertically"
 msgstr ""
 "Posición do panel de vista previa de tarefas cando está orientado "
 "verticalmente"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Show reminders for completed tasks"
 msgstr "Mostrar recordatorios para as tarefas completadas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid ""
 "Whether to show reminders for completed tasks. When set to false, reminders "
 "for completed tasks are suppressed."
@@ -8707,22 +8855,22 @@ msgstr ""
 "estabelecido a falso, os recordatorios para as tarefas completadas "
 "omitiránse."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Highlight overdue tasks"
 msgstr "Realce das tarefas vencidas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "Indica se realzar as tarefas vencidas con unha cor especial (task-overdue-"
 "color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Overdue tasks color"
 msgstr "Cor para as tarefas atrasadas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8730,21 +8878,21 @@ msgstr ""
 "Cor de fondo para as tarefas fóra de prazo, no formato «#rrggbb». Usado "
 "xunto ao realzado de tarefas fóra de prazo."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Time divisions"
 msgstr "Divisións horarias"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr ""
 "Os intervalos de tempo mostrados nas vistas diaria e de semana laboral, en "
 "minutos"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8753,80 +8901,84 @@ msgstr ""
 "unha localización sen traducir da base de datos de fusos horarios Olsen, p."
 "ex:«America/New York»"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Twenty four hour time format"
 msgstr "Formato de hora de vinte e catro horas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr ""
 "Indica se se mostran as horas en formato de vinte e catro horas en vez de "
 "usar am/pm"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Birthday and anniversary reminder"
 msgstr "Avisos de aniversarios"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Indica se se estabelece un aviso para os aniversarios"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Default appointment reminder"
 msgstr "Aviso de cita predeterminado"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Whether to set a default reminder for appointments"
 msgstr "Indica se se estabelece un aviso predeterminado para as citas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Use system timezone"
 msgstr "Usar o fuso horario do sistema"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr ""
 "Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
 "Evolution"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "First day of the week"
 msgstr "Primeiro día da semana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Monday is a work day"
 msgstr "Luns é un día de traballo"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Tuesday is a work day"
 msgstr "Martes é un día de traballo"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Wednesday is a work day"
 msgstr "Mércores é un día de traballo"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Thursday is a work day"
 msgstr "Xoves é un día de traballo"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Friday is a work day"
 msgstr "Venres é un día de traballo"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "Saturday is a work day"
 msgstr "Sábado é un día de traballo"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid "Sunday is a work day"
 msgstr "Domingo é un día de traballo"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+msgid "Create events, memos and tasks as Private by default"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr ""
 "(Obsolteo) O primeiro día da semana, desde o Domingo (0) ata o Sábado (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"week-start-day-name\" instead."
@@ -8834,11 +8986,11 @@ msgstr ""
 "Esta chave marcouse como obsoleta na versión 3.10 e non debería ser usada. "
 "Use «week-start-day-name» no lugar.  "
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid "(Deprecated) Work days"
 msgstr "(Obsoleto) Día de traballo"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key "
 "was deprecated in version 3.10 and should no longer be used. Use the \"work-"
@@ -8922,7 +9074,8 @@ msgid "Default charset in which to compose messages"
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Default charset in which to compose messages."
+#, fuzzy
+msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
@@ -9289,18 +9442,26 @@ msgstr ""
 "mostran cando se usan."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid "Wrap quoted text in replies"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid "If set to 'true' quoted text in replies will be wrapped."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 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:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Pode ser «mbox» ou «pdf»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Show image animations"
 msgstr "Mostrar as imaxes animadas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -9308,11 +9469,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:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 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:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -9320,11 +9481,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:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 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:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -9332,75 +9493,86 @@ 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:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 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:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 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:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 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:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 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:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Citation highlight color"
 msgstr "Cor de realce das citas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Citation highlight color."
 msgstr "Cor de realce das citas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo de cursor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 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:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 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:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 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:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 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:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+msgid "Show notification about missing remote content"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+msgid ""
+"When the message preview shows a message which requires to download remote "
+"content, while the download is not allowed for the user or the site, then "
+"show a notification about it on top of the preview panel."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show Animations"
 msgstr "Mostrar as animacións"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animacións."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show all message headers"
 msgstr "Mostrar todas as cabeceiras das mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 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:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 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:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 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 "
@@ -9411,35 +9583,35 @@ 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:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show photo of the sender"
 msgstr "Mostrar a fotografía do remitente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 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:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 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:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 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:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 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:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 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:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Mark as Seen always after specified timeout"
 msgstr "Marcar sempre como visto despois do tempo de espera indicado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
@@ -9448,38 +9620,48 @@ msgstr ""
 "non lida despois de acadar o tempo máximo de espera tamén despois de cambiar "
 "de cartafol."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 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:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 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:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 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:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 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:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 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:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 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:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#, fuzzy
+msgid "Show junk messages in the message-list"
+msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#, fuzzy
+msgid "Show junk messages (with a red 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:110
 msgid "Enable Unmatched search folder"
 msgstr "Activar o cartafol de busca non coincidente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -9487,11 +9669,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:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 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:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 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."
@@ -9499,32 +9681,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:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Height of the message-list pane"
 msgstr "Altura do panel da lista de mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Height of the message-list pane."
 msgstr "Altura do panel da lista de mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 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:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Width of the message-list pane"
 msgstr "Largura do panel da lista de mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Width of the message-list pane."
 msgstr "Largura do panel da lista de mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Layout style"
 msgstr "Estilo da disposición"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 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 "
@@ -9536,46 +9718,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:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Variable width font"
 msgstr "Tipo de letra de largura variábel"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 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:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 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:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Use custom fonts"
 msgstr "Usar tipos de letra personalizados"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 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:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 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:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9583,11 +9765,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:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 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:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9595,11 +9777,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:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 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:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9607,11 +9789,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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 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:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 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 "
@@ -9620,11 +9802,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:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Whether sort thread children always ascending"
 msgstr "Indica se ordenar os fíos fillos sempre de forma ascendente"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
@@ -9632,11 +9814,11 @@ msgstr ""
 "Esta opción indica se os fíos deben ordenarse de forma ascendente, fronte a "
 "usar o mesmo orde que no nivel principal do fío."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 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:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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 "
@@ -9648,27 +9830,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:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Log filter actions"
 msgstr "Rexistrar as accións de filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 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:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 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:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 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:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Flush Outbox after filtering"
 msgstr "Limpar a caixa de saída despois do filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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 "
@@ -9679,57 +9861,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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Default forward style"
 msgstr "Estilo de reencamiñamento predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Default reply style"
 msgstr "Estilo de resposta predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 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:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt on empty subject"
 msgstr "Avisar cando o «Asunto» estea baleiro"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when emptying the trash"
 msgstr "Avisar ao baleirar o lixo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user expunges"
 msgstr "Avisar cando o usuario expurgue"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 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:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 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:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9737,32 +9919,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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 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:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9770,19 +9952,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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt while marking multiple messages"
 msgstr "Avisar cando se marquen varias mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 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:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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 "
@@ -9792,13 +9974,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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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 "
@@ -9810,13 +9992,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:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 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:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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 "
@@ -9828,11 +10010,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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 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:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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."
@@ -9840,11 +10022,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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 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:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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 "
@@ -9855,11 +10037,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:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when replying to many recipients"
 msgstr "Avisar ao responder a moitos destinatarios"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -9867,7 +10049,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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid ""
 "Prompt when switching composer mode and the content needs to lose its "
 "formatting"
@@ -9875,7 +10057,7 @@ msgstr ""
 "Preguntar ao cambiar de modo de composición e cando o contido precisa perder "
 "o seu formato."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer mode and the content needs to lose its formatting."
@@ -9883,11 +10065,11 @@ msgstr ""
 "Activa/desactiva as preguntas que avisan de que está tentando cambiar o modo "
 "de composición e os contidos precisan perder o seu formatado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Confirmar o envío cando haxa moitos destinatarios Para e CC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "'composer-many-to-cc-recips-num' defines the threshold."
@@ -9895,7 +10077,7 @@ msgstr ""
 "Activa ou desactiva as preguntas ao enviar a varios destinatarios Para ou "
 "CC. O «composer-many-to-cc-recips-num» define o límite."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -9903,43 +10085,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:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Empty Trash folders on exit"
 msgstr "Baleirar os cartafoles de lixo ao saír"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 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:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 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:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 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:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9947,11 +10129,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:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar o valor orixinal da cabeceira «Data»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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 "
@@ -9961,11 +10143,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:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas coas cores asociadas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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."
@@ -9974,46 +10156,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:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Check incoming mail being junk"
 msgstr "Comprobar se o correo entrante é correo lixo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 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:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 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:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 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:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 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:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 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:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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 "
@@ -10023,13 +10205,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:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 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 "
@@ -10042,7 +10224,7 @@ msgstr ""
 "enderezos remotas (LDAP, por exemplo) están marcadas para o completado "
 "automático."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -10050,7 +10232,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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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 "
@@ -10061,13 +10243,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:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 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:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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 "
@@ -10077,11 +10259,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:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 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:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -10089,31 +10271,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:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "UID string of the default account."
 msgstr "Cadea UID para a conta predeterminada."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Save directory"
 msgstr "Cartafol onde gardar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Composer load/attach directory"
 msgstr "Cartafol para cargar/anexar do editor de mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 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:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Check for new messages on start"
 msgstr "Comprobar se hai mensaxes novas ao iniciar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -10121,11 +10303,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:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 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:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 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 "
@@ -10136,11 +10318,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:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronización do servidor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10148,11 +10330,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:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Allow expunge in virtual folders"
 msgstr "Permite purgar cartafoles virtuais"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder->Expunge "
 "will be callable in virtual folders, while the expunge itself will be done "
@@ -10165,12 +10347,12 @@ msgstr ""
 "cartafol virtual, non só para os mensaxes eliminados que pertenzan ao "
 "cartafol virtual."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 #: ../mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML mode"
 msgstr "Herda as cores do tema en modo HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
@@ -10178,11 +10360,11 @@ msgstr ""
 "Cando está activado as cores do tema para o fondo, texto e ligazóns envíanse "
 "no mensaxe formatado en HTML resultante."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "An Archive folder for On This Computer folders."
 msgstr "Un cartafol de arquivo para os Cartafoles neste computador"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -10190,11 +10372,11 @@ msgstr ""
 "Un cartafol Arquivo para usar en Mensaxes|Arquivar… característica activada "
 "cando está no cartafol \"Neste computador\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "(Deprecated) Default forward style"
 msgstr "(Obsoleto) Estilo de reencamiñamento predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -10202,11 +10384,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:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "(Deprecated) Default reply style"
 msgstr "(Obsoleto) Estilo de resposta predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -10214,12 +10396,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:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 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:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -10227,11 +10409,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:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 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:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -10239,7 +10421,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:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -10247,7 +10429,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:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -10493,10 +10675,12 @@ msgid "Mode to use when displaying mails"
 msgstr "Modo a usar ao mostrar os correos electrónicos"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
+#, fuzzy
 msgid ""
 "The mode to use for displaying mails. \"normal\" makes Evolution choose the "
 "best part to show, \"prefer_plain\" makes it use the text part, if present, "
-"and \"only_plain\" forces Evolution to only show plain text"
+"\"prefer_source\" makes it use the text part, if present, otherwise shows "
+"HTML source, and \"only_plain\" forces Evolution to only show plain text"
 msgstr ""
 "O modo a usar para mostrar os correos electrónicos. «normal» fai que "
 "Evolution seleccione a mellor parte para mostrar, «prefer_plain» fai que use "
@@ -10558,7 +10742,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:324
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:320
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexión"
 
@@ -10588,18 +10772,30 @@ msgid "Flag that enables a much simplified user interface."
 msgstr "Marca que activa unha interface de usuario moito máis simplificada."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+#, fuzzy
+msgid "List of button names to hide in the window switcher"
+msgstr ""
+"Ampliar imaxes grandes para que non sexan máis anchas que o ancho da xanela"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+msgid ""
+"Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
+"Change of this requires restart of the application."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
 msgid "Window buttons are visible"
 msgstr "Os botóns da xanela están visíbeis"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
 msgid "Whether the window buttons should be visible."
 msgstr "Indica se os botóns da xanela están visíbeis."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
 msgid "Window button style"
 msgstr "Estilo dos botóns de xanela"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -10609,40 +10805,40 @@ msgstr ""
 "de ferramentas». Se se selecciona «barra de ferramentas», o estilo dos "
 "botóns determinarao a configuración da barra de ferramentas do GNOME."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas está visíbel"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Indica se a barra de ferramentas está visíbel."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
 msgid "Sidebar is visible"
 msgstr "A barra lateral está visíbel"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
 msgid "Whether the sidebar should be visible."
 msgstr "Indica se a barra lateral está visíbel."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "Statusbar is visible"
 msgstr "A barra de estado é visíbel"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 msgid "Whether the status bar should be visible."
 msgstr "Indica se a barra de estado está visíbel."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "ID ou alias do compoñente que se mostrará de forma predeterminada ao iniciar."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
 msgid "Default sidebar width"
 msgstr "Largura predeterminada da barra lateral"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
 msgid "The default width for the sidebar, in pixels."
 msgstr "Largura predeterminada da barra lateral, en píxeles."
 
@@ -10682,15 +10878,6 @@ msgstr ""
 "tempo de compilación, normalmente /usr/bin/sa-learn. A orde non debería "
 "conter calquera outros argumentos."
 
-#: ../em-format/e-mail-formatter-attachment.c:424
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
-#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
-#: ../mail/message-list.etspec.h:4
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Anexo"
-msgstr[1] "Anexos"
-
 #: ../em-format/e-mail-formatter-attachment.c:425
 msgid "Display as attachment"
 msgstr "Mostrar como anexo"
@@ -10734,15 +10921,15 @@ msgstr "Mensaxe RFC822"
 msgid "Format part as an RFC822 message"
 msgstr "Formatar parte como mensaxe RFC822"
 
-#: ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print.c:51
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Nome"
 
-#: ../em-format/e-mail-formatter-print.c:53
-#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:51
+#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Tamaño"
 
@@ -10757,7 +10944,7 @@ msgstr "Titular"
 #. pseudo-header
 #: ../em-format/e-mail-formatter-quote-headers.c:199
 #: ../em-format/e-mail-formatter-utils.c:343
-#: ../modules/mail/em-mailer-prefs.c:1484
+#: ../modules/mail/em-mailer-prefs.c:1490
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
@@ -10912,14 +11099,18 @@ msgstr "_Visualizar o certificado"
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visíbel"
 
-#: ../em-format/e-mail-formatter-source.c:120
-msgid "Source"
-msgstr "Fonte"
-
 #: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 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:48 ../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
+#: ../modules/mail/em-mailer-prefs.c:64
+msgid "To"
+msgstr "Para"
+
 #: ../em-format/e-mail-formatter-utils.c:203
 #: ../em-format/e-mail-formatter-utils.c:220
 #: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
@@ -10932,26 +11123,26 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Cco"
 
-#: ../em-format/e-mail-formatter-utils.c:564
+#: ../em-format/e-mail-formatter-utils.c:566
 msgid "GPG signed"
 msgstr "Asinado con GPG"
 
-#: ../em-format/e-mail-formatter-utils.c:570
+#: ../em-format/e-mail-formatter-utils.c:572
 msgid "GPG encrypted"
 msgstr "Cifrado con GPG"
 
-#: ../em-format/e-mail-formatter-utils.c:576
+#: ../em-format/e-mail-formatter-utils.c:578
 msgid "S/MIME signed"
 msgstr "Cifrado S/MIME"
 
-#: ../em-format/e-mail-formatter-utils.c:582
+#: ../em-format/e-mail-formatter-utils.c:584
 msgid "S/MIME encrypted"
 msgstr "Cifrado con S/MIME"
 
-#: ../em-format/e-mail-formatter-utils.c:591
-#: ../mail/e-mail-config-security-page.c:748
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+#: ../em-format/e-mail-formatter-utils.c:593
+#: ../mail/e-mail-config-security-page.c:760
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:204
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:154
 msgid "Security"
 msgstr "Seguranza"
 
@@ -11111,71 +11302,53 @@ msgstr "Pechar esta mensaxe (Escape)"
 msgid "Failed to create a thread: "
 msgstr "Produciuse un fallo ao crear un fío:"
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
-msgid "Icon View"
-msgstr "Vista de iconas"
-
-#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
-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:1223
+#: ../e-util/e-attachment.c:1227
 msgid "Attached message"
 msgstr "Mensaxe anexada"
 
-#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
+#: ../e-util/e-attachment.c:2173 ../e-util/e-attachment.c:3170
 msgid "Operation was cancelled"
 msgstr "A operación foi cancelada"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011
-#: ../e-util/e-attachment.c:3382 ../e-util/e-attachment-store.c:691
+#: ../e-util/e-attachment.c:2333 ../e-util/e-attachment.c:3032
+#: ../e-util/e-attachment.c:3403 ../e-util/e-attachment-store.c:696
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
+#: ../e-util/e-attachment.c:2414 ../e-util/e-attachment.c:3463
 msgid "A load operation is already in progress"
 msgstr "Xa se está en proceso unha operación de carga"
 
-#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
+#: ../e-util/e-attachment.c:2422 ../e-util/e-attachment.c:3471
 msgid "A save operation is already in progress"
 msgstr "Xa se está en proceso unha operación de gardado"
 
-#: ../e-util/e-attachment.c:2521
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Non foi posíbel cargar «%s»"
-
-#: ../e-util/e-attachment.c:2524
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Non foi posíbel cargar o anexo"
-
-#: ../e-util/e-attachment.c:2809
+#: ../e-util/e-attachment.c:2830
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Non foi posíbel abrir «%s»"
 
-#: ../e-util/e-attachment.c:2812
+#: ../e-util/e-attachment.c:2833
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Non foi posíbel abrir o anexo"
 
-#: ../e-util/e-attachment.c:3459
+#: ../e-util/e-attachment.c:3480
 msgid "Attachment contents not loaded"
 msgstr "Non se cargaron os contidos do anexo"
 
-#: ../e-util/e-attachment.c:3550
+#: ../e-util/e-attachment.c:3571
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Non foi posíbel gardar «%s»"
 
-#: ../e-util/e-attachment.c:3553
+#: ../e-util/e-attachment.c:3574
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Non foi posíbel gardar o anexo"
@@ -11188,11 +11361,17 @@ msgstr "Propiedades dos anexos"
 msgid "F_ilename:"
 msgstr "Nome do f_icheiro:"
 
+#: ../e-util/e-attachment-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-link-dialog.c:422
+msgid "_Description:"
+msgstr "_Descrición:"
+
 #: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:526
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suxerir automaticamente a vista do anexo"
 
@@ -11205,12 +11384,12 @@ msgid "Set as _Background"
 msgstr "Estabelecer como _fondo"
 
 #: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:548
+#: ../e-util/e-attachment-tree-view.c:554
 msgid "Loading"
 msgstr "Cargando"
 
 #: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:560
+#: ../e-util/e-attachment-tree-view.c:566
 msgid "Saving"
 msgstr "Gardando"
 
@@ -11222,33 +11401,33 @@ msgstr "Ocultar a _barra de anexos"
 msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../e-util/e-attachment-store.c:486
+#: ../e-util/e-attachment-store.c:491
 msgid "Add Attachment"
 msgstr "Engadir un anexo"
 
-#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
+#: ../e-util/e-attachment-store.c:498 ../e-util/e-attachment-store.c:500
 msgid "A_ttach"
 msgstr "A_nexar"
 
-#: ../e-util/e-attachment-store.c:533
+#: ../e-util/e-attachment-store.c:538
 msgid "Archive selected directories using this format:"
 msgstr "Arquivar os cartafoles seleccionados usando este formato:"
 
-#: ../e-util/e-attachment-store.c:626
+#: ../e-util/e-attachment-store.c:631
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Gardar o anexo"
 msgstr[1] "Gardar os anexos"
 
-#: ../e-util/e-attachment-store.c:653
+#: ../e-util/e-attachment-store.c:658
 msgid "Do _not extract files from the attachment"
 msgstr "Non _extraer os ficheiros do ficheiro anexo"
 
-#: ../e-util/e-attachment-store.c:658
+#: ../e-util/e-attachment-store.c:663
 msgid "Save extracted files _only"
 msgstr "_Só gardar os ficheiros extraídos"
 
-#: ../e-util/e-attachment-store.c:663
+#: ../e-util/e-attachment-store.c:668
 msgid "Save extracted files and the original _archive"
 msgstr "Gardar os ficheiros extraídos e o _arquivo orixinal"
 
@@ -11276,16 +11455,16 @@ msgid "A_dd Attachment..."
 msgstr "Enga_dir un anexo…"
 
 #: ../e-util/e-attachment-view.c:468
-#: ../modules/addressbook/e-book-shell-view-actions.c:1071
-#: ../modules/calendar/e-cal-shell-view-actions.c:1240
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 #: ../modules/mail/e-mail-shell-view-actions.c:1645
 #: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../e-util/e-attachment-view.c:485
+#: ../e-util/e-attachment-view.c:485 ../e-util/e-source-selector.c:3376
 msgid "_Hide"
 msgstr "_Ocultar"
 
@@ -11346,40 +11525,40 @@ msgstr ""
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl+clic para abrir unha ligazón"
 
-#: ../e-util/e-calendar.c:195
+#: ../e-util/e-calendar.c:207
 msgid "Previous month"
 msgstr "Anterior mes"
 
-#: ../e-util/e-calendar.c:220
+#: ../e-util/e-calendar.c:232
 msgid "Next month"
 msgstr "Seguinte mes"
 
-#: ../e-util/e-calendar.c:246
+#: ../e-util/e-calendar.c:258
 msgid "Previous year"
 msgstr "Anterior ano"
 
-#: ../e-util/e-calendar.c:271
+#: ../e-util/e-calendar.c:283
 msgid "Next year"
 msgstr "Seguinte ano"
 
-#: ../e-util/e-calendar.c:295
+#: ../e-util/e-calendar.c:307
 msgid "Month Calendar"
 msgstr "Calendario mensual"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1322 ../e-util/e-calendar-item.c:2200
+#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1324
+#: ../e-util/e-calendar-item.c:1339
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1361
+#: ../e-util/e-calendar-item.c:1376
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B de %Y"
@@ -11481,7 +11660,7 @@ msgid "popup list"
 msgstr "lista emerxente"
 
 #: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
-#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2033
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2052
 msgid "?"
 msgstr "?"
 
@@ -11491,7 +11670,7 @@ msgstr "Agora"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 #: ../modules/itip-formatter/itip-view.c:221
 msgid "Today"
 msgstr "Hoxe"
@@ -11778,8 +11957,8 @@ 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:578 ../mail/e-mail-reader.c:3899
-#: ../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4037
+#: ../mail/mail-config.ui.h:73
 msgid "Default"
 msgstr "predeterminado"
 
@@ -12191,8 +12370,8 @@ msgstr "Encontrar os elementos que cumpran as seguintes condicións"
 #: ../e-util/e-mail-identity-combo-box.c:476
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
-#: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
 msgid "None"
 msgstr "Ningunha"
 
@@ -12704,37 +12883,37 @@ msgstr "Máis suxestións"
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1937
+#: ../e-util/e-html-editor-actions.c:1950
 #, c-format
 msgid "%s Dictionary"
 msgstr "Dicionario %s"
 
-#: ../e-util/e-html-editor-actions.c:2024
+#: ../e-util/e-html-editor-actions.c:2040
 msgid "_Emoticon"
 msgstr "_Emoticona"
 
-#: ../e-util/e-html-editor-actions.c:2025
+#: ../e-util/e-html-editor-actions.c:2041
 msgid "Insert Emoticon"
 msgstr "Inserir emoticona"
 
-#: ../e-util/e-html-editor-actions.c:2093
+#: ../e-util/e-html-editor-actions.c:2109
 msgid "Re_place"
 msgstr "Susb_tituir"
 
-#: ../e-util/e-html-editor-actions.c:2096
+#: ../e-util/e-html-editor-actions.c:2112
 msgid "_Image"
 msgstr "_Imaxe"
 
-#: ../e-util/e-html-editor-actions.c:2099
+#: ../e-util/e-html-editor-actions.c:2115
 msgid "_Link"
 msgstr "_Ligazón"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2103
+#: ../e-util/e-html-editor-actions.c:2119
 msgid "_Rule"
 msgstr "_Regra"
 
-#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-actions.c:2122
 #: ../e-util/e-html-editor-cell-dialog.c:738
 msgid "_Table"
 msgstr "_Táboa"
@@ -13014,8 +13193,8 @@ msgstr "Ribete"
 msgid "Midnight"
 msgstr "Medianoite"
 
-#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:36
-#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
+#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:38
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Borrador"
 
@@ -13048,7 +13227,7 @@ msgid "<b>Background Image</b>"
 msgstr "<b>Imaxe de fondo</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:638
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
 msgid "_Template:"
 msgstr "_Modelo:"
 
@@ -13138,7 +13317,7 @@ msgstr "Substituír todo"
 
 #. Ignore
 #: ../e-util/e-html-editor-spell-check-dialog.c:573
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:110
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -13161,7 +13340,7 @@ msgstr "<b>Dicionario</b>"
 msgid "Add word"
 msgstr "Engadir palabra"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:38
+#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "Comprobación ortográfica"
 
@@ -13202,11 +13381,11 @@ msgstr "Ta_maño:"
 msgid "Text Properties"
 msgstr "Propiedades do texto"
 
-#: ../e-util/e-html-editor-view.c:5474
+#: ../e-util/e-html-editor-view.c:6298
 msgid "Changed property"
 msgstr "Propiedade cambiada"
 
-#: ../e-util/e-html-editor-view.c:5475
+#: ../e-util/e-html-editor-view.c:6299
 msgid "Whether editor changed"
 msgstr "Indica se o editor cambiou"
 
@@ -13244,10 +13423,11 @@ msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a información que desexa importar:"
 
 #: ../e-util/e-import-assistant.c:533
+#, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+"Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
+"would like to try again, please click the \"Back\" button."
 msgstr ""
 "O Evolution buscou os axustes para importar desde os seguintes aplicativos: "
 "Pine, Netscape, Elm, iCalendar, pero non localizou ningún axuste que se "
@@ -13315,11 +13495,11 @@ msgstr "Prema en «Aplicar» para comezar a importar o ficheiro ao Evolution."
 msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
-#: ../e-util/e-mail-signature-editor.c:297
+#: ../e-util/e-mail-signature-editor.c:297 ../mail/e-mail-notes.c:905
 msgid "Close"
 msgstr "Pechar"
 
-#: ../e-util/e-mail-signature-editor.c:302
+#: ../e-util/e-mail-signature-editor.c:302 ../mail/e-mail-notes.c:910
 msgid "_Save and Close"
 msgstr "G_ardar e pechar"
 
@@ -13429,10 +13609,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:1157
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
-#: ../modules/calendar/e-memo-shell-view-actions.c:709
-#: ../modules/calendar/e-task-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:1183
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:933
 msgid "Any Category"
 msgstr "Calquera categoría"
 
@@ -13530,7 +13710,7 @@ msgstr "_Lembrar este contrasinal"
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Lembrar este contrasinal para o recordatorio durante a sesión"
 
-#: ../e-util/e-preferences-window.c:318
+#: ../e-util/e-preferences-window.c:321
 msgid "Evolution Preferences"
 msgstr "Preferencias do Evolution"
 
@@ -13684,7 +13864,7 @@ msgstr "Alcanzouse o inicio da páxina, continúase desde o final"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:329
 #: ../mail/importers/kmail-importer.c:253 ../mail/importers/pine-importer.c:422
-#: ../modules/mail/e-mail-shell-view.c:1172
+#: ../modules/mail/e-mail-shell-view.c:1242
 #: ../smime/gui/certificate-manager.c:1671
 msgid "Mail"
 msgstr "Correo"
@@ -13723,6 +13903,10 @@ msgstr "Ningún"
 msgid "Mail Receipt"
 msgstr "Destinatario do correo"
 
+#: ../e-util/e-send-options.ui.h:14
+msgid "Send Options"
+msgstr "Opcións de envío"
+
 #: ../e-util/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "R_esposta solicitada"
@@ -13836,24 +14020,55 @@ msgstr "Tipo:"
 msgid "Name:"
 msgstr "Nome:"
 
+#: ../e-util/e-source-config.c:813
+#, fuzzy
+msgid "Name cannot be empty"
+msgstr "Un ou máis valores non poden ser baleiros."
+
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1311
+#: ../e-util/e-source-config.c:1313
 msgid "Refresh every"
 msgstr "Actualizar cada"
 
-#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
+#: ../e-util/e-source-config.c:1343 ../e-util/e-source-config.c:1413
 msgid "Use a secure connection"
 msgstr "Usar unha conexión segura"
 
-#: ../e-util/e-source-config.c:1437
-msgid "Unset _trust for SSL certificate"
+#: ../e-util/e-source-config.c:1439
+#, fuzzy
+msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Desestabelecer _confianza para o certificado SSL"
 
-#: ../e-util/e-source-config.c:1473
+#: ../e-util/e-source-config.c:1475
 msgid "User"
 msgstr "Usuario"
 
+#: ../e-util/e-source-selector.c:3214
+#, fuzzy
+msgid "Show"
+msgstr "Mostrar %s"
+
+#: ../e-util/e-source-selector.c:3221
+#, fuzzy
+msgid "Group name"
+msgstr "Responder ao grupo"
+
+#: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
+#, fuzzy
+msgid "_Show"
+msgstr "Mostrar %s"
+
+#: ../e-util/e-source-selector.c:3428
+#, fuzzy
+msgid "Manage Groups"
+msgstr "Director"
+
+#: ../e-util/e-source-selector.c:3440
+#, fuzzy
+msgid "Available Groups:"
+msgstr "Campos _dispoñíbeis:"
+
 #: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "_Destino:"
@@ -13878,26 +14093,26 @@ msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:457
+#: ../e-util/e-spell-entry.c:478
 msgid "(no suggestions)"
 msgstr "(non hai suxestións)"
 
-#: ../e-util/e-spell-entry.c:481
+#: ../e-util/e-spell-entry.c:502
 msgid "More..."
 msgstr "Máis…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:566
+#: ../e-util/e-spell-entry.c:587
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Engadir \"%s\" ao Dicionario"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:615
+#: ../e-util/e-spell-entry.c:636
 msgid "Ignore All"
 msgstr "Ignorar todo"
 
-#: ../e-util/e-spell-entry.c:647
+#: ../e-util/e-spell-entry.c:668
 msgid "Spelling Suggestions"
 msgstr "Suxestións de ortografía"
 
@@ -13927,7 +14142,7 @@ msgstr "Non é posíbel abrir o ficheiro «{0}»."
 msgid "Failed to remove data source &quot;{0}&quot;."
 msgstr "Produciuse un erro ao retirar a fonte de datos «{0}»."
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:64
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:62
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "O informe de erro foi &quot;{1}&quot;."
 
@@ -14269,90 +14484,90 @@ msgid "Flags"
 msgstr "Bandeiras"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:721
+#: ../mail/e-mail-config-identity-page.c:760
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../e-util/e-web-view.c:316
+#: ../e-util/e-web-view.c:318
 msgid "_Copy Link Location"
 msgstr "_Copiar a localización da ligazón"
 
-#: ../e-util/e-web-view.c:318
+#: ../e-util/e-web-view.c:320
 msgid "Copy the link to the clipboard"
 msgstr "Copiar a ligazón no portapapeis"
 
-#: ../e-util/e-web-view.c:326
+#: ../e-util/e-web-view.c:328
 msgid "_Open Link in Browser"
 msgstr "_Abrir a ligazón no navegador"
 
-#: ../e-util/e-web-view.c:328
+#: ../e-util/e-web-view.c:330
 msgid "Open the link in a web browser"
 msgstr "_Abrir a ligazón no navegador web"
 
-#: ../e-util/e-web-view.c:336
+#: ../e-util/e-web-view.c:338
 msgid "_Copy Email Address"
 msgstr "Copiar o enderezo de _correo"
 
-#: ../e-util/e-web-view.c:343
+#: ../e-util/e-web-view.c:345
 msgid "Copy _Raw Email Address"
 msgstr "Copiar o enderezo de correo en _bruto"
 
-#: ../e-util/e-web-view.c:345
+#: ../e-util/e-web-view.c:347
 msgid "Copy the raw email address to the clipboard"
 msgstr "Copiar o enderezo de correo en bruto ao portapapeis"
 
-#: ../e-util/e-web-view.c:360
+#: ../e-util/e-web-view.c:362
 msgid "_Copy Image"
 msgstr "_Copiar imaxe"
 
-#: ../e-util/e-web-view.c:362
+#: ../e-util/e-web-view.c:364
 msgid "Copy the image to the clipboard"
 msgstr "Copiar a imaxe ao portapapeis"
 
-#: ../e-util/e-web-view.c:367
+#: ../e-util/e-web-view.c:369
 msgid "Save _Image..."
 msgstr "Gardar _imaxe…"
 
-#: ../e-util/e-web-view.c:369
+#: ../e-util/e-web-view.c:371
 msgid "Save the image to a file"
 msgstr "Gardar a imaxe a un ficheiro"
 
-#: ../e-util/e-web-view.c:389 ../e-util/e-web-view.c:1427
+#: ../e-util/e-web-view.c:391 ../e-util/e-web-view.c:1432
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto e as imaxes"
 
-#: ../e-util/e-web-view.c:1069
+#: ../e-util/e-web-view.c:1074
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar a %s"
 
-#: ../e-util/e-web-view.c:1071
+#: ../e-util/e-web-view.c:1076
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar/mostrar os enderezos"
 
-#: ../e-util/e-web-view.c:1082
+#: ../e-util/e-web-view.c:1087
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Ir á sección %s do mensaxe"
 
-#: ../e-util/e-web-view.c:1084
+#: ../e-util/e-web-view.c:1089
 msgid "Go to the beginning of the message"
 msgstr "Ir ao inicio da mensaxe"
 
-#: ../e-util/e-web-view.c:1088
+#: ../e-util/e-web-view.c:1093
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
 
-#: ../e-util/e-web-view.c:3039
+#: ../e-util/e-web-view.c:3127
 msgid "Copying image to clipboard"
 msgstr "Copiar imaxe ao portapapeis"
 
-#: ../e-util/e-web-view.c:3227
+#: ../e-util/e-web-view.c:3315
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#: ../e-util/e-web-view.c:3263
+#: ../e-util/e-web-view.c:3351
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Gardando imaxe en «%s»"
@@ -14401,7 +14616,7 @@ msgstr "Expresión regular incorrecta «{0}»."
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Non foi posíbel compilar a expresión regular «{1}»."
 
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:101
 msgid "Missing name."
 msgstr "Falta o nome."
 
@@ -14433,6 +14648,15 @@ 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.error.xml.h:16
+#, fuzzy
+msgid "Are you sure you want to remove rule '{0}'?"
+msgstr "Está seguro de que desexa eliminar a tarefa «{0}»?"
+
+#: ../e-util/filter.error.xml.h:17
+msgid "_Keep"
+msgstr ""
+
 #: ../e-util/filter.ui.h:2
 msgid "the current time"
 msgstr "o instante actual"
@@ -14445,7 +14669,7 @@ msgstr "o instante que indique"
 msgid "a time relative to the current time"
 msgstr "unha hora relativa á hora actual"
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:89
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:90
 msgid "seconds"
 msgstr "segundos"
 
@@ -14554,7 +14778,7 @@ msgstr "_Crear unha vista nova"
 msgid "_Replace existing view"
 msgstr "Substituí_r a vista existente"
 
-#: ../e-util/widgets.error.xml.h:1
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:195
 msgid "Do you wish to save your changes?"
 msgstr "Desexa gardar as modificacións?"
 
@@ -14562,7 +14786,7 @@ msgstr "Desexa gardar as modificacións?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "Modificouse esta sinatura pero non se gardou."
 
-#: ../e-util/widgets.error.xml.h:3
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:197
 msgid "_Discard changes"
 msgstr "_Rexeitar as modificacións"
 
@@ -14590,7 +14814,7 @@ 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
+#: ../evolution.appdata.xml.in.h:3
 msgid ""
 "Evolution is a personal information management application that provides "
 "integrated mail, calendaring and address book functionality."
@@ -14599,7 +14823,7 @@ msgstr ""
 "funcionalidades integradas de correo electrónico, calendario e axenda de "
 "enderezos."
 
-#: ../evolution.appdata.xml.in.h:2
+#: ../evolution.appdata.xml.in.h:4
 msgid ""
 "Evolution supports a wide range of industry standard data formats and "
 "network protocols for information exchange, with an emphasis on standards "
@@ -14612,6 +14836,19 @@ msgstr ""
 "tamén pode integrarse perfectamente con Microsoft Exchange empregando a "
 "extensión \"Exchange Web Services\" (EWS)."
 
+#: ../libemail-engine/camel-sasl-oauth2-google.c:29
+#, fuzzy
+msgid "OAuth2 Google"
+msgstr "OAuth2"
+
+#: ../libemail-engine/camel-sasl-oauth2-google.c:30
+#, fuzzy
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr ""
+"Esta opción usará un token de acceso OAuth 2.0 para conectarse ao servidor"
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -14673,50 +14910,50 @@ msgid "Invalid folder URI '%s'"
 msgstr "O URI do cartafol «%s» non é válido"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:680
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:680
 #: ../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1049
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1063
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1222
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1050
 msgid "Drafts"
 msgstr "Borradores"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1233
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1051
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 msgid "Outbox"
 msgstr "Caixa de saída"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1237
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1056
 msgid "Sent"
 msgstr "Enviados"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1225
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1055
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
 #: ../plugins/templates/templates.c:1488
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../libemail-engine/e-mail-session.c:1261
+#: ../libemail-engine/e-mail-session.c:1262
 #, c-format
 msgid "User cancelled operation"
 msgstr "O usuario cancelou a operación"
 
-#: ../libemail-engine/e-mail-session.c:1318
+#: ../libemail-engine/e-mail-session.c:1319
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -14724,13 +14961,13 @@ msgid ""
 msgstr ""
 "Non se forneceu ningún enderezo de destino, cancelouse o reenvío do mensaxe."
 
-#: ../libemail-engine/e-mail-session.c:1331
+#: ../libemail-engine/e-mail-session.c:1332
 #, c-format
 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.c:2360
+#: ../libemail-engine/e-mail-session.c:2362
 #, c-format
 msgid "Waiting for '%s'"
 msgstr "Agardando por «%s»"
@@ -14779,17 +15016,17 @@ msgstr "Produciuse un erro ao anexar ao cartafol local «Enviados»: %s"
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../libemail-engine/e-mail-store-utils.c:189
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Desconectando de «%s»"
 
-#: ../libemail-engine/e-mail-store-utils.c:265
+#: ../libemail-engine/e-mail-store-utils.c:266
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Conectando novamente con %s"
 
-#: ../libemail-engine/e-mail-store-utils.c:350
+#: ../libemail-engine/e-mail-store-utils.c:351
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta «%s» para o modo sen conexión"
@@ -14957,7 +15194,7 @@ msgid "De_fault"
 msgstr "Prede_finido"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1276
+#: ../modules/mail/em-composer-prefs.c:1282
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
@@ -14975,12 +15212,12 @@ msgstr "Non se forneceu ningún enderezo de correo"
 msgid "Missing domain in email address"
 msgstr "Falta o dominio no enderezo de correo"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:773
+#: ../mail/e-mail-browser.c:131 ../shell/e-shell-window-actions.c:773
 #: ../shell/e-shell-window-actions.c:780 ../shell/e-shell-window-actions.c:787
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
-#: ../mail/e-mail-browser.c:286
+#: ../mail/e-mail-browser.c:288
 msgid "(No Subject)"
 msgstr "(Sen asunto)"
 
@@ -15002,7 +15239,12 @@ msgstr "Asistente de contas do Evolution"
 msgid "_Revise Details"
 msgstr "_Revisar detalles"
 
-#: ../mail/e-mail-config-auth-check.c:339
+#: ../mail/e-mail-config-auth-check.c:177
+#, fuzzy
+msgid "Querying authentication types..."
+msgstr "Tipo de _autenticación"
+
+#: ../mail/e-mail-config-auth-check.c:340
 msgid "Check for Supported Types"
 msgstr "Comprobar tipos admitidos"
 
@@ -15025,96 +15267,137 @@ msgstr ""
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../mail/e-mail-config-defaults-page.c:371
+#, fuzzy
+msgid "Checking server settings..."
+msgstr "Comprobando o servizo"
+
+#: ../mail/e-mail-config-defaults-page.c:489
+#, fuzzy
+msgctxt "ReplyForward"
+msgid "Use global setting"
+msgstr "Usar a localización predeterminada"
+
+#: ../mail/e-mail-config-defaults-page.c:491 ../mail/mail-config.ui.h:26
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "Anexo"
+
+#: ../mail/e-mail-config-defaults-page.c:493 ../mail/mail-config.ui.h:27
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "En liña (estilo Outlook)"
+
+#: ../mail/e-mail-config-defaults-page.c:495 ../mail/mail-config.ui.h:28
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "Citado"
+
+#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:29
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "Non citar"
+
+#: ../mail/e-mail-config-defaults-page.c:822
 msgid "Special Folders"
 msgstr "Cartafoles especiais"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:831
 msgid "Draft Messages _Folder:"
 msgstr "Cartafol das _mensaxes enviadas:"
 
-#: ../mail/e-mail-config-defaults-page.c:568
+#: ../mail/e-mail-config-defaults-page.c:841
 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:855
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol das _mensaxes enviadas:"
 
-#: ../mail/e-mail-config-defaults-page.c:592
+#: ../mail/e-mail-config-defaults-page.c:865
 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:884
 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:901
 msgid "Archi_ve Folder:"
 msgstr "Cartafol Arqui_vo:"
 
-#: ../mail/e-mail-config-defaults-page.c:638
-#: ../modules/mail/em-mailer-prefs.c:1397
+#: ../mail/e-mail-config-defaults-page.c:911
+#: ../modules/mail/em-mailer-prefs.c:1403
 msgid "Choose a folder to archive messages to."
 msgstr "Escolla un cartafol onde arquivar mensaxes."
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:929
 msgid "_Restore Defaults"
 msgstr "_Restaurar valores predeterminados"
 
-#: ../mail/e-mail-config-defaults-page.c:666
+#: ../mail/e-mail-config-defaults-page.c:946
+#, fuzzy
+msgid "_Lookup Folders"
+msgstr "Cartafoles locais"
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "Use a Real Folder for _Trash:"
 msgstr "Usar un cartafol real para o _Lixo:"
 
-#: ../mail/e-mail-config-defaults-page.c:667
+#: ../mail/e-mail-config-defaults-page.c:965
 msgid "Choose a folder for deleted messages."
 msgstr "Seleccione un cartafol no que gardar as mensaxes eliminadas."
 
-#: ../mail/e-mail-config-defaults-page.c:676
+#: ../mail/e-mail-config-defaults-page.c:974
 msgid "Use a Real Folder for _Junk:"
 msgstr "Usar un cartafol real para o _lixo:"
 
-#: ../mail/e-mail-config-defaults-page.c:677
+#: ../mail/e-mail-config-defaults-page.c:975
 msgid "Choose a folder for junk messages."
 msgstr "Seleccione un cartafol para o spam."
 
-#: ../mail/e-mail-config-defaults-page.c:694
+#: ../mail/e-mail-config-defaults-page.c:992
 msgid "Composing Messages"
 msgstr "Escribir unha mensaxe"
 
-#: ../mail/e-mail-config-defaults-page.c:703
+#: ../mail/e-mail-config-defaults-page.c:1001
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar _sempre unha copia de carbón (Cc) a:"
 
-#: ../mail/e-mail-config-defaults-page.c:728
+#: ../mail/e-mail-config-defaults-page.c:1026
 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:763
+#: ../mail/e-mail-config-defaults-page.c:1057
+#, fuzzy
+msgid "Re_ply style:"
+msgstr "Estilo da _resposta:"
+
+#: ../mail/e-mail-config-defaults-page.c:1093
 msgid "Message Receipts"
 msgstr "Confirmacións de lectura das mensaxes"
 
-#: ../mail/e-mail-config-defaults-page.c:772
+#: ../mail/e-mail-config-defaults-page.c:1102
 msgid "S_end message receipts:"
 msgstr "_Enviar as confirmacións de lectura das mensaxes:"
 
-#: ../mail/e-mail-config-defaults-page.c:797
+#: ../mail/e-mail-config-defaults-page.c:1127
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/e-mail-config-defaults-page.c:803
+#: ../mail/e-mail-config-defaults-page.c:1133
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/e-mail-config-defaults-page.c:809
+#: ../mail/e-mail-config-defaults-page.c:1139
 msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
-#: ../mail/e-mail-config-defaults-page.c:880
+#: ../mail/e-mail-config-defaults-page.c:1246
 msgid "Defaults"
 msgstr "Predefinicións"
 
-#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-identity-page.c:286
 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 "
@@ -15124,13 +15407,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:310
-#: ../mail/e-mail-config-summary-page.c:322
+#: ../mail/e-mail-config-identity-page.c:314
+#: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Información da conta"
 
-#: ../mail/e-mail-config-identity-page.c:346
-#: ../mail/e-mail-config-summary-page.c:352
+#: ../mail/e-mail-config-identity-page.c:352
+#: ../mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, \"Work\" or \"Personal\"."
@@ -15138,41 +15421,65 @@ msgstr ""
 "O nome de enriba usarase para identificar esta conta.\n"
 "Por exemplo: «Traballo» ou «Persoal»"
 
-#: ../mail/e-mail-config-identity-page.c:363
+#: ../mail/e-mail-config-identity-page.c:369
 msgid "Required Information"
 msgstr "Información solicitada"
 
-#: ../mail/e-mail-config-identity-page.c:372
+#: ../mail/e-mail-config-identity-page.c:378
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/e-mail-config-identity-page.c:399
+#: ../mail/e-mail-config-identity-page.c:407
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../mail/e-mail-config-identity-page.c:446
+#: ../mail/e-mail-config-identity-page.c:456
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Información opcional"
 
-#: ../mail/e-mail-config-identity-page.c:455
+#: ../mail/e-mail-config-identity-page.c:465
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/e-mail-config-identity-page.c:482
+#: ../mail/e-mail-config-identity-page.c:494
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: ../mail/e-mail-config-identity-page.c:537
+#: ../mail/e-mail-config-identity-page.c:549
 msgid "Add Ne_w Signature..."
 msgstr "Engadir unha sinatura _nova…"
 
-#: ../mail/e-mail-config-identity-page.c:555
+#: ../mail/e-mail-config-identity-page.c:567
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr ""
 "_Buscar a información do servidor de correo baseado no enderezo de correo "
 "inserido"
 
+#: ../mail/e-mail-config-identity-page.c:611
+#, fuzzy
+msgid "Full Name cannot be empty"
+msgstr "Un ou máis valores non poden ser baleiros."
+
+#: ../mail/e-mail-config-identity-page.c:618
+#, fuzzy
+msgid "Email Address cannot be empty"
+msgstr "Un ou máis valores non poden ser baleiros."
+
+#: ../mail/e-mail-config-identity-page.c:623
+msgid "Email Address is not a valid email"
+msgstr ""
+
+#: ../mail/e-mail-config-identity-page.c:635
+msgid "Reply To is not a valid email"
+msgstr ""
+
+#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-summary-page.c:632
+#, fuzzy
+msgid "Account Name cannot be empty"
+msgstr "Un ou máis valores non poden ser baleiros."
+
 #: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Buscando polos detalles da conta..."
@@ -15202,10 +15509,10 @@ msgid "%s - %s"
 msgstr "%s - %s"
 
 #: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.c:625
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../modules/calendar/e-calendar-preferences.c:620
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Xeral"
@@ -15228,22 +15535,22 @@ msgid "Si_gning algorithm:"
 msgstr "Algoritmo da si_natura:"
 
 #: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:581 ../mail/mail-config.ui.h:73
+#: ../mail/e-mail-config-security-page.c:593 ../mail/mail-config.ui.h:74
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:584 ../mail/mail-config.ui.h:74
+#: ../mail/e-mail-config-security-page.c:596 ../mail/mail-config.ui.h:75
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:587 ../mail/mail-config.ui.h:75
+#: ../mail/e-mail-config-security-page.c:599 ../mail/mail-config.ui.h:76
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:590 ../mail/mail-config.ui.h:76
+#: ../mail/e-mail-config-security-page.c:602 ../mail/mail-config.ui.h:77
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -15263,42 +15570,46 @@ msgstr "Cifrar sempre para min _mesmo ao enviar correo cifrado"
 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:514
+#: ../mail/e-mail-config-security-page.c:502
+msgid "Prefer _inline sign/encrypt for plain text messages"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:526
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:523
+#: ../mail/e-mail-config-security-page.c:535
 msgid "Sig_ning certificate:"
 msgstr "Certificado de si_natura:"
 
-#: ../mail/e-mail-config-security-page.c:547
-#: ../mail/e-mail-config-security-page.c:653
+#: ../mail/e-mail-config-security-page.c:559
+#: ../mail/e-mail-config-security-page.c:665
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../mail/e-mail-config-security-page.c:556
-#: ../mail/e-mail-config-security-page.c:662 ../mail/mail-dialogs.ui.h:5
+#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:674 ../mail/mail-dialogs.ui.h:5
 #: ../shell/e-shell-window-actions.c:876
 msgid "_Clear"
 msgstr "Limpa_r"
 
-#: ../mail/e-mail-config-security-page.c:565
+#: ../mail/e-mail-config-security-page.c:577
 msgid "Signing _algorithm:"
 msgstr "_Algoritmo da sinatura:"
 
-#: ../mail/e-mail-config-security-page.c:606
+#: ../mail/e-mail-config-security-page.c:618
 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:629
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Encryption certificate:"
 msgstr "Certificado de cifrado:"
 
-#: ../mail/e-mail-config-security-page.c:671
+#: ../mail/e-mail-config-security-page.c:683
 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:691
+#: ../mail/e-mail-config-security-page.c:703
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Cifrar sempre para min mesmo ao enviar correo cifrado"
 
@@ -15310,60 +15621,60 @@ msgstr "Envío de correo"
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/e-mail-config-summary-page.c:141
-msgid "SSL"
-msgstr "SSL"
-
-#: ../mail/e-mail-config-summary-page.c:144
+#: ../mail/e-mail-config-summary-page.c:142
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:305
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "STARTTLS"
+msgstr ""
+
+#: ../mail/e-mail-config-summary-page.c:306
 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:369
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Detalles persoais"
 
-#: ../mail/e-mail-config-summary-page.c:378
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Nome completo"
 
-#: ../mail/e-mail-config-summary-page.c:392
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "Enderezo de correo"
 
-#: ../mail/e-mail-config-summary-page.c:406
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Recibindo"
 
-#: ../mail/e-mail-config-summary-page.c:418
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Enviando"
 
-#: ../mail/e-mail-config-summary-page.c:430
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Tipo de servidor:"
 
-#: ../mail/e-mail-config-summary-page.c:451
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:605
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../mail/e-mail-config-summary-page.c:472
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:703
 msgid "Username:"
 msgstr "Nome do usuario:"
 
-#: ../mail/e-mail-config-summary-page.c:493
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Seguranza:"
 
-#: ../mail/e-mail-config-summary-page.c:784
+#: ../mail/e-mail-config-summary-page.c:787
 msgid "Account Summary"
 msgstr "Resumo da conta"
 
@@ -15386,27 +15697,27 @@ msgstr "Benvido/a"
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/e-mail-display.c:103
+#: ../mail/e-mail-display.c:104
 msgid "_Add to Address Book..."
 msgstr "Eng_adir á axenda de enderezos…"
 
-#: ../mail/e-mail-display.c:110
+#: ../mail/e-mail-display.c:111
 msgid "_To This Address"
 msgstr "A es_te enderezo"
 
-#: ../mail/e-mail-display.c:117
+#: ../mail/e-mail-display.c:118
 msgid "_From This Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/e-mail-display.c:124
+#: ../mail/e-mail-display.c:125
 msgid "Send _Reply To..."
 msgstr "Enviar _resposta a…"
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:127
 msgid "Send a reply message to this address"
 msgstr "Enviar unha mensaxe de resposta a este enderezo"
 
-#: ../mail/e-mail-display.c:133
+#: ../mail/e-mail-display.c:134
 msgid "Create Search _Folder"
 msgstr "Crear un carta_fol de busca"
 
@@ -15521,6 +15832,31 @@ msgstr ""
 msgid "Color"
 msgstr "Cor"
 
+#: ../mail/e-mail-notes.c:310 ../mail/e-mail-notes.c:692
+#, fuzzy
+msgid "Message Note"
+msgstr "Mensaxes para"
+
+#: ../mail/e-mail-notes.c:612
+#, fuzzy
+msgid "Cannot find message in its folder summary"
+msgstr "Copiando as mensaxes ao cartafol %s"
+
+#: ../mail/e-mail-notes.c:815
+#, fuzzy
+msgid "Storing changes..."
+msgstr "Formatando a mensaxe…"
+
+#: ../mail/e-mail-notes.c:940
+#, fuzzy
+msgid "Edit Message Note"
+msgstr "_Editar a mensaxe"
+
+#: ../mail/e-mail-notes.c:1058
+#, fuzzy
+msgid "Retrieving message..."
+msgstr "Descargando mensaxe"
+
 #: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "Mover as cabeceiras seleccionadas á parte superior"
@@ -15549,648 +15885,681 @@ msgstr "Nome da cabeceira:"
 msgid "Header Value"
 msgstr "Valor da cabecera"
 
-#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:121
+#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:123
 msgid "Headers"
 msgstr "Cabeceiras"
 
-#: ../mail/e-mail-printer.c:168
+#: ../mail/e-mail-printer.c:155
 #, c-format
 msgid "Page %d of %d"
 msgstr "Páxina %d de %d"
 
-#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:62
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:63
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:147
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:146
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:1200 ../mail/e-mail-reader.c:1412
-#: ../mail/e-mail-reader.c:1452
+#: ../mail/e-mail-reader.c:488
+#, fuzzy
+msgid "Deleting message note..."
+msgstr "Eliminando mensaxes antigas"
+
+#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1523
 msgid "_Do not ask me again."
 msgstr "_Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1529
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar sempre «Responder a:» para as listas de correo."
 
-#: ../mail/e-mail-reader.c:1661
+#: ../mail/e-mail-reader.c:1732
 msgid "Failed to retrieve message:"
 msgstr "Produciuse un erro ao obter a mensaxe:"
 
-#: ../mail/e-mail-reader.c:1706 ../mail/e-mail-reader.c:3041
+#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3158
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando a mensaxe «%s»"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1965
 msgid "A_dd Sender to Address Book"
 msgstr "Enga_dir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1896
+#: ../mail/e-mail-reader.c:1967
 msgid "Add sender to address book"
 msgstr "Engadir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1972
 msgid "_Archive..."
 msgstr "_Arquivo…"
 
-#: ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1974
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Mover os mensaxes seleccionados ao cartafol Arquivo para a conta"
 
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1979
 msgid "Check for _Junk"
 msgstr "Comprobar se hai correo li_xo"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1981
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo lixo"
 
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:1986
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafol…"
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1988
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:1993
 msgid "_Delete Message"
 msgstr "E_liminar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:2000
+msgid "_Add note..."
+msgstr "_Engadir nota…"
+
+#: ../mail/e-mail-reader.c:2002
+msgid "Add a note for the selected message"
+msgstr "Engadir unha nota para a mensaxe seleccionado"
+
+#: ../mail/e-mail-reader.c:2007
+msgid "Delete no_te"
+msgstr "Eliminar _nota"
+
+#: ../mail/e-mail-reader.c:2009
+msgid "Delete the note for the selected message"
+msgstr "Eliminar a nota para a mensaxe seleccionado"
+
+#: ../mail/e-mail-reader.c:2014
+msgid "_Edit note..."
+msgstr "_Editar nota…"
+
+#: ../mail/e-mail-reader.c:2016
+msgid "Edit a note for the selected message"
+msgstr "Editar unha nota para a mensaxe seleccionada"
+
+#: ../mail/e-mail-reader.c:2021
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Crear unha regra de filtrado segundo a _rolda de correo…"
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:2023
 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:1936
+#: ../mail/e-mail-reader.c:2028
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Crear unha regra de filtrado segundo os _destinatarios…"
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:2030
 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:1943
+#: ../mail/e-mail-reader.c:2035
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Crear unha regra de filtrado segundo o re_mitente…"
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:2037
 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:1950
+#: ../mail/e-mail-reader.c:2042
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Crear unha regra de filtrado segundo o _asunto…"
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:2044
 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:1957
+#: ../mail/e-mail-reader.c:2049
 msgid "A_pply Filters"
 msgstr "_Aplicar os filtros"
 
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:2051
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtrado ás mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:2056
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxe…"
 
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:2058
 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:1971
+#: ../mail/e-mail-reader.c:2063
 msgid "_Clear Flag"
 msgstr "E_liminar a marca"
 
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:2065
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Retirar as marcas de seguimento das mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:2070
 msgid "_Flag Completed"
 msgstr "_Marcar como completado"
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:2072
 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:1985
+#: ../mail/e-mail-reader.c:2077
 msgid "Follow _Up..."
 msgstr "Seguimento…"
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:2079
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2084
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:1994 ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reencamiñar a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2091
 msgid "Forward As _Attached"
 msgstr "Reencamiñar como un _anexo"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2098
 msgid "_Inline"
 msgstr "_Inserida"
 
-#: ../mail/e-mail-reader.c:2008 ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
 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:2013
+#: ../mail/e-mail-reader.c:2105
 msgid "Forward As _Inline"
 msgstr "Reencamiñar _inserida"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2112
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:2022 ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reencamiñar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2119
 msgid "Forward As _Quoted"
 msgstr "Reencamiñar _citada"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2126
 msgid "_Load Images"
 msgstr "_Cargar as imaxes"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2128
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../mail/e-mail-reader.c:2041 ../mail/e-mail-reader.c:2419
+#: ../mail/e-mail-reader.c:2133 ../mail/e-mail-reader.c:2523
 msgid "_Ignore Subthread"
 msgstr "_Ignorar subfío"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2135
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Marcar novos correos na subconversa como lida automaticamente"
 
-#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2423
+#: ../mail/e-mail-reader.c:2140 ../mail/e-mail-reader.c:2527
 msgid "_Ignore Thread"
 msgstr "_Ignorar fío"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2142
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Marcar os novos correos nesta conversa como lidas automaticamente"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2147
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2149
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2154
 msgid "_Junk"
 msgstr "_Correo lixo"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2156
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo lixo"
 
-#: ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2161
 msgid "_Not Junk"
 msgstr "_Non é correo lixo"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2163
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:2076
+#: ../mail/e-mail-reader.c:2168
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2170
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:2083 ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2175 ../mail/e-mail-reader.c:2547
 msgid "Do not _Ignore Subthread"
 msgstr "Non _ignorar sub-conversa"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2177
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Non marcar novos correos nunha subconversa como lidos automaticamente"
 
-#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2447
+#: ../mail/e-mail-reader.c:2182 ../mail/e-mail-reader.c:2551
 msgid "Do not _Ignore Thread"
 msgstr "Non _ignorar conversa"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2184
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Non marcar novos correos nesta conversa como lidos automaticamente"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2189
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2191
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2196
 msgid "_Unread"
 msgstr "_Sen ler"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2198
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2203
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe nova…"
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2205
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2210
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2212
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para escribir unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2217
 msgid "_Open in New Window"
 msgstr "Abrir nunha xanela n_ova"
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2219
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2224
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafol…"
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2226
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2231
 msgid "_Next Message"
 msgstr "Segui_nte mensaxe"
 
-#: ../mail/e-mail-reader.c:2141
+#: ../mail/e-mail-reader.c:2233
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2238
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2240
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2245
 msgid "Next _Thread"
 msgstr "Seguin_te fío"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2247
 msgid "Display the next thread"
 msgstr "Mostrar o seguinte fío"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2252
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _sen ler"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2254
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2259
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2261
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2266
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2268
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2181
+#: ../mail/e-mail-reader.c:2273
 msgid "Previous T_hread"
 msgstr "_Conversa anterior"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2275
 msgid "Display the previous thread"
 msgstr "Mostrar o fío anterior"
 
-#: ../mail/e-mail-reader.c:2188
+#: ../mail/e-mail-reader.c:2280
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe sen ler"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2282
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2289
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:2204
+#: ../mail/e-mail-reader.c:2296
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2301
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2303
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguén a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2308
 msgid "Remo_ve Attachments"
 msgstr "Eliminar os _anexos"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2310
 msgid "Remove attachments"
 msgstr "Retirar os anexos"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2315
 msgid "Remove Du_plicate Messages"
 msgstr "Retirar as mensaxes du_plicadas"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2317
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar se hai mensaxes seleccionadas que estean duplicadas"
 
-#: ../mail/e-mail-reader.c:2230 ../mail/mail.error.xml.h:30
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../mail/e-mail-reader.c:2232
+#: ../mail/e-mail-reader.c:2324
 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:2237 ../mail/mail.error.xml.h:28
+#: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:26
 msgid "Reply to _List"
 msgstr "Responder á _lista"
 
-#: ../mail/e-mail-reader.c:2239
+#: ../mail/e-mail-reader.c:2331
 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:2244 ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2336 ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2338
 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:2251
+#: ../mail/e-mail-reader.c:2343
 msgid "_Save as mbox..."
 msgstr "Gardar como mbox…"
 
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2345
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes seleccionadas como un ficheiro mbox"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2350
 msgid "_Message Source"
 msgstr "Fonte da _mensaxe"
 
-#: ../mail/e-mail-reader.c:2260
+#: ../mail/e-mail-reader.c:2352
 msgid "Show the raw email source of the message"
 msgstr "Mostrar a fonte en bruto da mensaxe"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../mail/e-mail-reader.c:2364
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:2274
+#: ../mail/e-mail-reader.c:2366
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2279
+#: ../mail/e-mail-reader.c:2371
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2373
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaño orixinal"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../mail/e-mail-reader.c:2378
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2288
+#: ../mail/e-mail-reader.c:2380
 msgid "Increase the text size"
 msgstr "Aumentar o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:2295
+#: ../mail/e-mail-reader.c:2387
 msgid "Decrease the text size"
 msgstr "Diminuír o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2394
 msgid "Cre_ate"
 msgstr "Cre_ar"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2401
 msgid "Ch_aracter Encoding"
 msgstr "Codificación de car_acteres"
 
-#: ../mail/e-mail-reader.c:2316
+#: ../mail/e-mail-reader.c:2408
 msgid "F_orward As"
 msgstr "Reencamiñar c_omo…"
 
-#: ../mail/e-mail-reader.c:2323
+#: ../mail/e-mail-reader.c:2415
 msgid "_Group Reply"
 msgstr "_Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:2330
+#: ../mail/e-mail-reader.c:2422
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:2337
+#: ../mail/e-mail-reader.c:2429
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:2344
+#: ../mail/e-mail-reader.c:2436
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:2351
+#: ../mail/e-mail-reader.c:2443
 msgid "_Zoom"
 msgstr "A_mpliar"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2453
 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:2363
+#: ../mail/e-mail-reader.c:2455
 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:2368
+#: ../mail/e-mail-reader.c:2460
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Crear un cartafol de busca segundo os des_tinatarios…"
 
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2462
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2467
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Crear un cartafol de busca segundo o _remitente…"
 
-#: ../mail/e-mail-reader.c:2377
+#: ../mail/e-mail-reader.c:2469
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:2382
+#: ../mail/e-mail-reader.c:2474
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Crear un cartafol de busca segundo o as_unto…"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2476
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2515
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimento…"
 
-#: ../mail/e-mail-reader.c:2427
+#: ../mail/e-mail-reader.c:2531
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:2431
+#: ../mail/e-mail-reader.c:2535
 msgid "Mark as _Junk"
 msgstr "Marcar como correo l_ixo"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2539
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo lixo"
 
-#: ../mail/e-mail-reader.c:2439
+#: ../mail/e-mail-reader.c:2543
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2555
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2559
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../mail/e-mail-reader.c:2603
 msgid "_Caret Mode"
 msgstr "Activar o _cursor"
 
-#: ../mail/e-mail-reader.c:2501
+#: ../mail/e-mail-reader.c:2605
 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:2507
+#: ../mail/e-mail-reader.c:2611
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:2509
+#: ../mail/e-mail-reader.c:2613
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrónico"
 
-#: ../mail/e-mail-reader.c:3047
+#: ../mail/e-mail-reader.c:3164
 msgid "Retrieving message"
 msgstr "Descargando mensaxe"
 
-#: ../mail/e-mail-reader.c:4078 ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4216 ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Reencamiñar"
 
-#: ../mail/e-mail-reader.c:4079
+#: ../mail/e-mail-reader.c:4217
 msgid "Forward the selected message to someone"
 msgstr "Reencamiñar a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:4098
+#: ../mail/e-mail-reader.c:4236
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:4099
+#: ../mail/e-mail-reader.c:4237
 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:4165 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:4303 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:4177
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
+#: ../mail/e-mail-reader.c:4315
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:4181
-#: ../modules/calendar/e-cal-shell-view-actions.c:1205
+#: ../mail/e-mail-reader.c:4319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:4190 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4328 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader.c:5240
+#: ../mail/e-mail-reader.c:5406
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Permitir o contido remoto para calquera de %s"
 
-#: ../mail/e-mail-reader.c:5242
+#: ../mail/e-mail-reader.c:5408
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Permitir o contido remoto para %s"
 
-#: ../mail/e-mail-reader.c:5259
+#: ../mail/e-mail-reader.c:5425
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Permitir contido remoto desde %s"
 
-#: ../mail/e-mail-reader.c:5316
+#: ../mail/e-mail-reader.c:5442
+msgid "Do not show this message again"
+msgstr "Non mostrar esta mensaxe outra vez"
+
+#: ../mail/e-mail-reader.c:5490
 msgid "Load remote content"
 msgstr "Cargar o contido remoto"
 
@@ -16203,13 +16572,6 @@ msgstr "Non avisarme de novo."
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando o cartafol «%s»"
 
-#: ../mail/e-mail-reader-utils.c:650 ../mail/mail-send-recv.c:486
-#: ../mail/mail-send-recv.c:1285 ../plugins/face/face.c:176
-#: ../shell/e-shell.c:972 ../shell/e-shell.c:994
-#: ../smime/gui/certificate-manager.c:346
-msgid "Unknown error"
-msgstr "Erro descoñecido"
-
 #: ../mail/e-mail-reader-utils.c:1165
 msgid "Marking thread to be ignored"
 msgstr "Marcar conversa para ignorala"
@@ -16226,13 +16588,13 @@ msgstr "Marcando sub-conversa para ignorala"
 msgid "Unmarking subthread from being ignored"
 msgstr "Desmarcando sub-conversa para ignorala"
 
-#: ../mail/e-mail-reader-utils.c:1417
+#: ../mail/e-mail-reader-utils.c:1421
 msgid "Printing"
 msgstr "Imprimindo"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1654
+#: ../mail/e-mail-reader-utils.c:1658
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -16247,7 +16609,7 @@ msgstr[1] ""
 "O cartafol «%s» contén %u mensaxes duplicadas. Ten certeza de que quere "
 "eliminalas?"
 
-#: ../mail/e-mail-reader-utils.c:2485
+#: ../mail/e-mail-reader-utils.c:2489
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe"
@@ -16258,17 +16620,17 @@ msgstr[1] "Gardar mensaxes"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2506
+#: ../mail/e-mail-reader-utils.c:2510
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
 msgstr[1] "Mensaxes"
 
-#: ../mail/e-mail-reader-utils.c:2879
+#: ../mail/e-mail-reader-utils.c:2883
 msgid "Parsing message"
 msgstr "Analizando mensaxe"
 
-#: ../mail/e-mail-request.c:204
+#: ../mail/e-mail-request.c:207
 msgid "The message has no text content."
 msgstr "O mensaxe non ten contido de texto."
 
@@ -16286,11 +16648,58 @@ msgstr "A autenticación %s fallou"
 msgid "No data source found for UID '%s'"
 msgstr "Non foi posíbel atopar os datos para o UID «%s»"
 
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../mail/em-composer-utils.c:390
+#, fuzzy, c-format
+msgid "Are you sure you want to send a message with %d To and CC recipients?"
+msgid_plural ""
+"Are you sure you want to send a message with %d To and CC recipients?"
+msgstr[0] ""
+"Está seguro de que desexa enviar unha mensaxe cos destinatarios {0} Para e "
+"CC?"
+msgstr[1] ""
+"Está seguro de que desexa enviar unha mensaxe cos destinatarios {0} Para e "
+"CC?"
+
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../mail/em-composer-utils.c:396
+#, fuzzy, c-format
+msgid ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgid_plural ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr[0] ""
+"Está tentando enviar un mensaxe a {0} destinatarios en campos Para e CC. "
+"Isto fará que todos os destinatarios vexan os enderezos de correo dos "
+"outros. Nalgúns casos este comportamento non é desexado, especialmente se "
+"eles non se conocen ou se a privacidade é un asunto de importancia. "
+"Considere engadir destinatarios usando o campo BCC no lugar."
+msgstr[1] ""
+"Está tentando enviar un mensaxe a {0} destinatarios en campos Para e CC. "
+"Isto fará que todos os destinatarios vexan os enderezos de correo dos "
+"outros. Nalgúns casos este comportamento non é desexado, especialmente se "
+"eles non se conocen ou se a privacidade é un asunto de importancia. "
+"Considere engadir destinatarios usando o campo BCC no lugar."
+
+#. This message is never removed from the camel operation, otherwise the GtkInfoBar
+#. hides itself and the user sees no feedback.
+#: ../mail/em-composer-utils.c:790
+msgid "Waiting for attachments to load..."
+msgstr ""
+
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1603
+#: ../mail/em-composer-utils.c:1686
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16298,24 +16707,24 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} ás ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:1609
+#: ../mail/em-composer-utils.c:1692
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reencamiñada --------"
 
-#: ../mail/em-composer-utils.c:1614
+#: ../mail/em-composer-utils.c:1697
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2827
+#: ../mail/em-composer-utils.c:2984
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3265
+#: ../mail/em-composer-utils.c:3471
 msgid "Posting destination"
 msgstr "Destino da publicación"
 
-#: ../mail/em-composer-utils.c:3270
+#: ../mail/em-composer-utils.c:3476
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
@@ -16448,12 +16857,12 @@ msgstr "Movendo o cartafol %s"
 msgid "Copying folder %s"
 msgstr "Copiando o cartafol %s"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2467
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2494
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2469
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2496
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes ao cartafol %s"
@@ -16506,7 +16915,7 @@ msgid "Unsubscribe From _All"
 msgstr "Desubscribirse de _todo"
 
 #: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1029
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16514,7 +16923,7 @@ msgstr[0] "%d sen ler, "
 msgstr[1] "%d sen ler, "
 
 #: ../mail/em-subscription-editor.c:1343
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16581,7 +16990,7 @@ msgid "Stop the current operation"
 msgstr "Deter a operación actual"
 
 #: ../mail/em-subscription-editor.c:1986
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "_Deter"
 
@@ -16775,162 +17184,174 @@ msgstr "Puntuación"
 msgid "Size (kB)"
 msgstr "Tamaño (KB)"
 
+#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
+#, fuzzy
+msgid "is greater than or equal to"
+msgstr "é maior que"
+
 #: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
 #: ../mail/vfoldertypes.xml.in.h:37
+#, fuzzy
+msgid "is less than or equal to"
+msgstr "é menor que"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:39
+#: ../mail/vfoldertypes.xml.in.h:39
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
-#: ../mail/vfoldertypes.xml.in.h:40
+#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:42
 msgid "Important"
 msgstr "Importante"
 
 #. Past tense, as in "has been read".
-#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
-#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+#: ../mail/filtertypes.xml.in.h:40 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:43 ../mail/vfoldertypes.xml.in.h:43
 msgid "Read"
 msgstr "Ler"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:128
-#: ../mail/vfoldertypes.xml.in.h:42
+#: ../mail/filtertypes.xml.in.h:41 ../mail/mail-config.ui.h:130
+#: ../mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Correo lixo"
 
-#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
-#: ../mail/vfoldertypes.xml.in.h:43
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
 msgstr "Seguimento"
 
-#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
-#: ../mail/vfoldertypes.xml.in.h:44
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
 msgid "is Flagged"
 msgstr "está marcado"
 
-#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
-#: ../mail/vfoldertypes.xml.in.h:45
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
 msgid "is not Flagged"
 msgstr "non está marcado"
 
-#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
-#: ../mail/vfoldertypes.xml.in.h:46
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
 msgid "is Completed"
 msgstr "está completado"
 
-#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
-#: ../mail/vfoldertypes.xml.in.h:47
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 msgid "is not Completed"
 msgstr "non está completado"
 
-#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
-#: ../mail/vfoldertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
 msgid "Mailing list"
 msgstr "Rolda de correo"
 
-#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
-#: ../mail/vfoldertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:52 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:55
 msgid "Regex Match"
 msgstr "Coincidir coa expresión regular"
 
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:53 ../mail/searchtypes.xml.in.h:55
+#: ../mail/vfoldertypes.xml.in.h:56
 msgid "Message Header"
 msgstr "Cabeceira da mensaxe"
 
-#: ../mail/filtertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:54
 msgid "Source Account"
 msgstr "Conta de orixe"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:55
 msgid "Pipe to Program"
 msgstr "Canalizar para o programa"
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns"
 msgstr "retorna"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:57
 msgid "does not return"
 msgstr "non retorna"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:58
 msgid "returns greater than"
 msgstr "retorna maior que"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:59
 msgid "returns less than"
 msgstr "retorna menor que"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:60
 msgid "Junk Test"
 msgstr "Proba de correo lixo"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:61
 msgid "Message is Junk"
 msgstr "A mensaxe é un correo lixo"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:62
 msgid "Message is not Junk"
 msgstr "A mensaxe non é un correo lixo"
 
-#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:63 ../mail/vfoldertypes.xml.in.h:57
 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
+#: ../mail/filtertypes.xml.in.h:64 ../mail/searchtypes.xml.in.h:56
+#: ../mail/vfoldertypes.xml.in.h:58
 msgid "Match All"
 msgstr "Coincidir todo"
 
-#: ../mail/filtertypes.xml.in.h:65
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Stop Processing"
 msgstr "Deter o procesamento"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Set Label"
 msgstr "Estabelecer a etiqueta"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Assign Color"
 msgstr "Asignar unha cor"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Unset Color"
 msgstr "Quitar cor"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:72
 msgid "Assign Score"
 msgstr "Asignar unha puntuación"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Adjust Score"
 msgstr "Axustar a puntuación"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Set Status"
 msgstr "Estabelecer o estado"
 
-#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
-#: ../mail/vfoldertypes.xml.in.h:38
+#: ../mail/filtertypes.xml.in.h:75 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: ../mail/filtertypes.xml.in.h:73
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Unset Status"
 msgstr "Desfacer a definición de estado"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Beep"
 msgstr "Son de aviso"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:78
 msgid "Play Sound"
 msgstr "Reproducir un son"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:79
 msgid "Run Program"
 msgstr "Executar o programa"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:80
 msgid "Forward to"
 msgstr "Reencamiñar a"
 
@@ -17000,7 +17421,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Importar correo e contactos desde KMail."
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1057
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 msgid "Trash"
 msgstr "Lixo"
 
@@ -17116,8 +17537,8 @@ msgid "Automatically insert _emoticons"
 msgstr "Inserir imaxes de _emoticonas automaticamente"
 
 #: ../mail/mail-config.ui.h:11
-msgid "Use Unicode characters for smile_ys"
-msgstr "Usar caracteres Unicode para os sorr_isos"
+msgid "Use Un_icode characters for emoticons"
+msgstr "Usar caracteres _Unicode para as emoticonas."
 
 #: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
@@ -17174,47 +17595,31 @@ msgstr ""
 "S/MIME)"
 
 #: ../mail/mail-config.ui.h:25
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "Anexo"
-
-#: ../mail/mail-config.ui.h:26
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "En liña (estilo Outlook)"
-
-#: ../mail/mail-config.ui.h:27
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "Citado"
+msgid "_Wrap quoted text in replies"
+msgstr "_Axustar o texto entre comiñas nas respostas"
 
-#: ../mail/mail-config.ui.h:28
-msgctxt "ReplyForward"
-msgid "Do Not Quote"
-msgstr "Non citar"
-
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "En liña"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "Sig_natures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "_Languages"
 msgstr "I_diomas"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Languages Table"
 msgstr "Táboa de idiomas"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -17222,11 +17627,11 @@ msgstr ""
 "Esta lista de idiomas mostra unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Check spelling while I _type"
 msgstr "Comprobar a ortografía men_tres escribe"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -17235,80 +17640,72 @@ msgstr ""
 "antes de realizar as seguintes accións marcadas:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with an _empty subject line"
 msgstr "Enviar unha m_ensaxe co asunto baleiro"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Enviar unha mensaxe só con destinatarios _Bcc definidos"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Sending a message to many _To and CC recipients"
 msgstr "Enviando unha mensaxe a varios destinatarios _Para e CC"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Enviar unha resposta _privada á mensaxes da lista de correo"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Enviar unha resposta a un grande _número de destinatarios"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 "Per_mitir que unha lista de correo redirixa as respostas privadas de novo á "
 "lista"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Enviar unha mensaxe con _destinatarios non inseridos como enderezos de correo"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Enviando un mensaxe usando unha _tecla rápida (Ctrl+Intro)"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 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:60
+#: ../mail/mail-config.ui.h:61
 msgid "Use for Folders"
 msgstr "Usar para os cartafoles"
 
-#: ../mail/mail-config.ui.h:61
-msgid "A_dd"
-msgstr "Enga_dir"
-
-#: ../mail/mail-config.ui.h:63
-msgid "Re_move"
-msgstr "E_liminar"
-
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 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:67 ../modules/mail/em-composer-prefs.c:864
+#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:864
 msgid "Account"
 msgstr "Conta"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Send account overrides"
 msgstr "Enviar sobrescritura de conta"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 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 "
@@ -17320,225 +17717,230 @@ 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:70
+#: ../mail/mail-config.ui.h:71
 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:71
+#: ../mail/mail-config.ui.h:72
 msgid "Send Account"
 msgstr "Conta de envío"
 
-#: ../mail/mail-config.ui.h:77 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:79 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Start up"
 msgstr "Iniciar"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Check for new _messages on start"
 msgstr "Comprobar se hai _mensaxes novas ao iniciar"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 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:82
+#: ../mail/mail-config.ui.h:83
 msgid "Message Display"
 msgstr "Vista das mensaxes"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:85
 msgid "S_tandard Font:"
 msgstr "Tipo de letra es_tándar:"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Select HTML fixed width font"
 msgstr "Seleccionar o tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Select HTML variable width font"
 msgstr "Seleccionar o tipo de letra de largura variábel para HTML"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Fix_ed Width Font:"
 msgstr "Tipo de l_etra de largura fixa:"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como lidas despois de"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:91
 msgid "Highlight _quotations with"
 msgstr "Realzar as _citas con"
 
-#: ../mail/mail-config.ui.h:91
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../mail/mail-config.ui.h:92
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Pick a color"
 msgstr "Seleccionar unha cor"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:94
 msgid "Default character e_ncoding:"
 msgstr "Codificació_n de caracteres predeterminada:"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 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:95
+#: ../mail/mail-config.ui.h:96
 msgid "F_all back to threading messages by subject"
 msgstr "Volver agrupar as mensaxes polo _asunto"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "Delete Mail"
 msgstr "Eliminar o correo"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "Empty _trash folders"
 msgstr "Baleirar os cartafoles do _lixo"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar antes de e_xpurgar un cartafol"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Archive Mail"
 msgstr "Arquivar correo"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "On This Computer A_rchive folder:"
 msgstr "Cartafol Ar_quivo Neste computador:"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Archive folder to use for On This Computer messages"
 msgstr "O cartafol Arquivo a usar para os mensaxes Neste computador"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "_Show animated images"
 msgstr "Mo_strar as imaxes animadas"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 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:105
+#: ../mail/mail-config.ui.h:106
 msgid "Loading Remote Content"
 msgstr "Cargando contidos remotos"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "_Never load remote content from the Internet"
 msgstr "_Non cargar nunca o contido remoto desde Internet"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "_Load remote content only in messages from contacts"
 msgstr "Ca_rgar o contido remoto só para as mensaxes desde os contactos"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "_Always load remote content from the Internet"
 msgstr "C_argar sempre o contido remoto desde Internet"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
+#, fuzzy
+msgid "Notify about _missing remote content in the message preview"
+msgstr "_Mostrar a fotografía do remitente na vista previa das mensaxes"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Add"
 msgstr "Engadir"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:112
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:113
 msgid "Allow for sites:"
 msgstr "Permitir para sitios:"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:114
 msgid "Allow for senders:"
 msgstr "Permitir para os destinatarios:"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
 msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
-#: ../mail/mail-config.ui.h:114 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:116 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Sender Photograph"
 msgstr "Fotografía do remitente"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 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:117
+#: ../mail/mail-config.ui.h:119
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "Buscar en gra_vatar.com a fotografía do emisor"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:120
 msgid "Displayed Message Headers"
 msgstr "Mostrar as cabeceiras da mensaxe"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:121
 msgid "Mail Headers Table"
 msgstr "Táboa de cabeceiras de correo"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 #: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Formato da data e da hora"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:124
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar as _mensaxes entrantes para detectar correo lixo"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:125
 msgid "_Delete junk messages"
 msgstr "_Eliminar o correo lixo"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:126
 msgid "Junk Test Options"
 msgstr "Opcións de proba de spam"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:127
 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:126
+#: ../mail/mail-config.ui.h:128
 msgid "_Lookup in local address book only"
 msgstr "Buscar só nas axendas de enderezos _locais"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:129
 msgid "Check cu_stom headers for junk"
 msgstr "Comprobar as cabeceiras personalizada_s para detectar correo lixo"
 
-#: ../mail/mail-config.ui.h:129
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
+#: ../mail/mail-config.ui.h:131
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:234
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
 msgid "No encryption"
 msgstr "Sen cifrado"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:132
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:133
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
@@ -17704,32 +18106,12 @@ msgstr ""
 "os destinatarios na súa mensaxe. Para evitar isto debería engadir polo menos "
 "un destinatario «Para:» ou «CC:»."
 
-#: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to send a message with {0} To and CC recipients?"
-msgstr ""
-"Está seguro de que desexa enviar unha mensaxe cos destinatarios {0} Para e "
-"CC?"
-
 #: ../mail/mail.error.xml.h:17
-msgid ""
-"You are trying to send a message to {0} recipients in To and CC fields. This "
-"would result in all recipients seeing the email addresses of each other. In "
-"some cases this behaviour is undesired, especially if they do not know each "
-"other or if privacy is a concern. Consider adding recipients to the BCC "
-"field instead."
-msgstr ""
-"Está tentando enviar un mensaxe a {0} destinatarios en campos Para e CC. "
-"Isto fará que todos os destinatarios vexan os enderezos de correo dos "
-"outros. Nalgúns casos este comportamento non é desexado, especialmente se "
-"eles non se conocen ou se a privacidade é un asunto de importancia. "
-"Considere engadir destinatarios usando o campo BCC no lugar."
-
-#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr ""
 "Está seguro de que desexa enviar unha mensaxe con un enderezo incorrecto?"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:18
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -17738,12 +18120,12 @@ msgstr ""
 "electrónico correcto:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr ""
 "Está seguro de que desexa enviar unha mensaxe con enderezos incorrectos?"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -17752,11 +18134,11 @@ msgstr ""
 "electrónico correctos:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Send private reply?"
 msgstr "Desexa enviar unha resposta privada?"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -17766,11 +18148,11 @@ msgstr ""
 "mediante unha lista de correo, pero a lista está tentando redireccionar a "
 "súa resposta de novo á lista. Está seguro que desexa continuar?"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Reply _Privately"
 msgstr "Responder de forma _privada"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -17780,11 +18162,11 @@ msgstr ""
 "correo, pero está respondendo de forma privada ao remitente, non á lista. "
 "Está seguro que desexa continuar?"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
 msgstr "Desexa enviar unha resposta a todos os destinatarios?"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -17792,13 +18174,13 @@ msgstr ""
 "Está respondendo a un correo electrónico que se enviou a moitos "
 "destinatarios. Está seguro que desexa responder a TODOS eles?"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:31
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Non é posíbel enviar esta mensaxe porque non indicou ningún destinatario"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -17806,11 +18188,11 @@ msgstr ""
 "Introduza un enderezo de correo correcto no campo «Para:». Pode buscar "
 "enderezos de correo premendo no botón «Para:» ao lado da caixa da entrada."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "Desexa usar o cartafol de borradores predeterminado?"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -17818,11 +18200,11 @@ msgstr ""
 "Non é posíbel abrir o cartafol de borradores desta conta. Desexa usar no seu "
 "lugar o cartafol de borradores do sistema?"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Use _Default"
 msgstr "Usar o pre_definido"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -17830,15 +18212,15 @@ msgstr ""
 "Está seguro de que desexa retirar permanentemente todas as mensaxes "
 "eliminadas do cartafol «{0}»?"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Se continúa non poderá recuperar estas mensaxes."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
 msgid "_Expunge"
 msgstr "_Compactar"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -17846,23 +18228,23 @@ msgstr ""
 "Está seguro de que desexa retirar permanentemente todas as mensaxes "
 "eliminadas de todos os cartafoles?"
 
-#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../mail/mail.error.xml.h:40 ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiadas mensaxes á vez pode levar moito tempo."
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "_Open Messages"
 msgstr "_Abrir as mensaxes"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Ten mensaxes sen enviar. Desexa saír de todas formas?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -17873,55 +18255,55 @@ msgstr ""
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while {0}."
 msgstr "Produciuse un erro ao {0}."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while performing operation."
 msgstr "Produciuse un erro ao efectuar a operación."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Introduza o contrasinal."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Produciuse un erro ao cargar as definicións dos filtros."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Non é posíbel gardar no cartafol «{0}»."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Cannot save to file \"{0}\"."
 msgstr "Non é posíbel gardar no ficheiro «{0}»."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Non é posíbel crear o cartafol de gardado porque «{1}»"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot create temporary save directory."
 msgstr "Non é posíbel crear o cartafol de gardado temporal."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but cannot overwrite it."
 msgstr "O ficheiro existe pero non é posíbel sobrescribilo."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but is not a regular file."
 msgstr "O ficheiro existe pero non é un ficheiro normal."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Non é posíbel eliminar o cartafol «{0}»."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Non é posíbel eliminar o cartafol do sistema «{0}»."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -17929,25 +18311,25 @@ msgstr ""
 "O Evolution precisa os cartafoles do sistema para funcionar correctamente e "
 "non é posíbel renomealos, movelos ou eliminalos."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "Produciuse un erro ao expurgar o cartafol &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "Produciuse un erro ao actualizar o cartafol &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Non é posíbel renomear ou mover o cartafol do sistema «{0}»."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:65
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 "Está seguro de que desexa eliminar o cartafol «{0}» e todos os seus "
 "subcartafoles?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -17955,20 +18337,20 @@ msgstr ""
 "Se elimina o cartafol, todo o seu contido e o dos seus subcartafoles "
 "eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Really delete folder \"{0}\"?"
 msgstr "Desexa confirmar o borrado do cartafol «{0}»?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Se elimina o cartafol, eliminarase permanentemente todo o seu contido."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid "These messages are not copies."
 msgstr "Estes mensaxes non son copias."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:71
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -17979,63 +18361,63 @@ msgstr ""
 "fisicamente.\n"
 "Está seguro de que desexa facer isto?"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:72
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Non é posíbel renomear «{0}» como «{1}»."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:73
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Xa existe un cartafol co nome «{1}». Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Non é posíbel mover o cartafol «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Non é posíbel cartafol orixinal. Erro: «{2}»"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Non é posíbel abrir o cartafol destino. Erro: «{2}»"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Non é posíbel copiar o cartafol «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot create folder \"{0}\"."
 msgstr "Non é posíbel crear o cartafol «{0}»."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot open folder. Error: {1}"
 msgstr "Non é posíbel abrir o cartafol. Erro: «{1}»."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot save changes to account."
 msgstr "Non é posíbel gardar as modificacións na conta."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a información requirida."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:82
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear dúas contas co mesmo nome."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Are you sure you want to delete this account?"
 msgstr "Está seguro de que desexa eliminar esta conta?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Se continúa, a información da conta eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:85
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Está seguro de que desexa eliminar esta conta e todos os seus proxies?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -18043,30 +18425,30 @@ msgstr ""
 "Se continúa, a información da conta e toda a\n"
 "información do proxy eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Está seguro de que desexa desactivar esta conta e eliminar todos os seus "
 "proxies?"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:89
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Se continúa, as contas proxy eliminaranse permanentemente."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:90
 msgid "Do _Not Disable"
 msgstr "_Non desactivar"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:91
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Non é posíbel editar o cartafol de busca «{0}» porque non existe."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -18075,39 +18457,39 @@ msgstr ""
 "se é necesario, vaia ao editor de cartafoles de busca para engadilo "
 "explicitamente."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:95
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Non é posíbel engadir o cartafol de busca «{0}»."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:96
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Xa existe un cartafol co nome «{0}». Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:97
 msgid "Search Folders automatically updated."
 msgstr "Os cartafoles de busca actualizáronse automaticamente."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:98
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:99
 msgid "Missing folder."
 msgstr "Falta o cartafol."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:100
 msgid "You must specify a folder."
 msgstr "Debe indicar un cartafol."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:102
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nome a este cartafol de busca."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:103
 msgid "No folder selected."
 msgstr "Non se seleccionou ningún cartafol."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -18117,11 +18499,11 @@ msgstr ""
 "Fágao seleccionando os cartafoles individualmente, ou seleccionando todos os "
 "cartafoles locais, todos os cartafoles remotos ou ambos."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:106
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Produciuse un problema ao migrar o cartafol de correo antigo «{0}»."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -18133,19 +18515,19 @@ msgstr ""
 "Pode escoller entre ignorar este cartafol, sobrescribilo, anexar os seus "
 "contidos ou saír."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:111
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:112
 msgid "_Append"
 msgstr "_Anexar"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:113
 msgid "Evolution's local mail format has changed."
 msgstr "O formato de correo electrónico local de Evolution cambiou."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -18164,19 +18546,19 @@ msgstr ""
 "Se escolle a migración comprobe con anterioridade que haxa suficiente espazo "
 "libre no seu disco."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:117
 msgid "_Exit Evolution"
 msgstr "_Saír do Evolution"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:118
 msgid "_Migrate Now"
 msgstr "_Migrar agora"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to read license file."
 msgstr "Non é posíbel ler o ficheiro da licenza."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -18184,28 +18566,32 @@ msgstr ""
 "Non é posíbel ler o ficheiro de licenza «{0}» debido a un problema de "
 "instalación. Non poderá usar este provedor até que acepte a súa licenza."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:121
 msgid "Please wait."
 msgstr "Agarde."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:122
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Estase solicitando do servidor unha lista de mecanismos de autenticación "
 "compatíbeis."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
 "Produciuse un erro ao solicitar a lista de mecanismos de autenticación "
 "admitidos polo servidor."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:124
+msgid "Failed to get server setup."
+msgstr "Produciuse un fallo ao obter á configuración do servidor."
+
+#: ../mail/mail.error.xml.h:125
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Desxa sincronizar os cartafoles localmente para o uso sen conexión?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -18213,27 +18599,27 @@ msgstr ""
 "Desexa sincronizar localmente os cartafoles que están marcados para o uso "
 "sen conexión?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:127
 msgid "Do _Not Synchronize"
 msgstr "_Non sincronizar"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:128
 msgid "_Synchronize"
 msgstr "_Sincronizar"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:129
 msgid "Do you want to mark all messages as read?"
 msgstr "Desexa marcar todas as mensaxes como lidas?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:130
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Isto marcará todas as mensaxes como lidas no cartafol seleccionado."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:131
 msgid "Also mark messages in subfolders?"
 msgstr "Desexa marcar tamén as mensaxes nos subcartafoles?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18241,67 +18627,67 @@ msgstr ""
 "Desexa marcar unicamente as mensaxes do cartafol actual como lidas ou tamén "
 "as dos subcartafoles?"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:133
 msgid "In Current Folder and _Subfolders"
 msgstr "No cartafol actual e nos _subcartafoles"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:134
 msgid "In Current _Folder Only"
 msgstr "Só no carta_fol actual"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:135
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr "Debería Evolution pechar esta xanela ao responder ou reencamiñar?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:136
 msgid "_Yes, Always"
 msgstr "_Si, sempre"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:137
 msgid "_No, Never"
 msgstr "_Non, nunca"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:138
 msgid "Copy folder in folder tree."
 msgstr "Copiar cartafol no árbore de cartafois."
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:139
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "Ten certeza que quere copiar o cartafol «{0}» a «{1}»?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:141
 msgid "Do _not copy"
 msgstr "_Non copiar"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:142
 msgid "_Always copy"
 msgstr "Copiar _sempre"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:143
 msgid "N_ever copy"
 msgstr "N_unca copiar"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:144
 msgid "Move folder in folder tree."
 msgstr "Mover cartafol no árbore de cartafois."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:145
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "Está seguro de que desexa mover o cartafol «{0}» a «{1}»?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:147
 msgid "Do _not move"
 msgstr "_Non mover"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:148
 msgid "_Always move"
 msgstr "Mover _sempre"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:149
 msgid "N_ever move"
 msgstr "N_unca mover"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:150
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -18309,68 +18695,68 @@ msgstr ""
 "Non é posíbel enviar esta mensaxe porque a conta que escolleu para enviala "
 "non está activada"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:151
 msgid "Please enable the account or send using another account."
 msgstr "Active a conta ou faga o envío usando outra conta."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:152
 msgid "Mail Deletion Failed"
 msgstr "Produciuse un fallo na eliminación do correo"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:153
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Non ten os permisos suficientes para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:154
 msgid "\"Check Junk\" Failed"
 msgstr "Produciuse un fallo na comprobación do correo lixo"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:155
 msgid "\"Report Junk\" Failed"
 msgstr "Produciuse un fallo ao informar do correo lixo"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:156
 msgid "\"Report Not Junk\" Failed"
 msgstr "Produciuse un fallo ao informar do que non é correo lixo"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:157
 msgid "Remove duplicate messages?"
 msgstr "Desexa retirar as mensaxes duplicadas?"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:158
 msgid "No duplicate messages found."
 msgstr "Non se atoparon mensaxes duplicadas."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:160
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "O cartafol «{0}» non contén ningunha mensaxe duplicada."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "Produciuse un fallo ao conectarse á conta &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Produciuse un erro ao desconectar a conta &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Produciuse un erro ao desuscribirse do cartafol &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:164
 msgid "Unable to retrieve message."
 msgstr "Non foi posíbel obter a mensaxe."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:165
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:166
 msgid "Message is not available in offline mode."
 msgstr "A mensaxe non está dispoñíbel en modo desconectado."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:167
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
@@ -18385,40 +18771,40 @@ msgstr ""
 "asegurarse de que todos os mensaxes do cartafol estarán dispoñíbeis en modo "
 "desconectado."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to open folder."
 msgstr "Produciuse un erro ao abrir o cartafol."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:170
 msgid "Failed to find duplicate messages."
 msgstr "Produciuse un erro ao buscar as mensaxes duplicadas."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to retrieve messages."
 msgstr "Produciuse un erro ao obter as mensaxes."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to mark messages as read."
 msgstr "Produciuse un erro ao marcar as mensaxes como lidas."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to remove attachments from messages."
 msgstr "Produciuse un erro ao retirar os anexos das mensaxes."
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:174
 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:176
+#: ../mail/mail.error.xml.h:175
 msgid "Failed to save messages to disk."
 msgstr "Produciuse un erro ao gardar as mensaxes ao disco."
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:176
 msgid "Hidden file is attached."
 msgstr "Existe un ficheiro oculto adxunto."
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:177
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -18426,51 +18812,51 @@ 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:179
+#: ../mail/mail.error.xml.h:178
 msgid "Printing failed."
 msgstr "Produciuse un fallo ao imprimir."
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:179
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "A impresora respondeu &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:181
+#: ../mail/mail.error.xml.h:180
 msgid "Could not perform this operation on {0}."
 msgstr "Non é posíbel realizar esta operación en {0}."
 
-#: ../mail/mail.error.xml.h:182
+#: ../mail/mail.error.xml.h:181
 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:183
+#: ../mail/mail.error.xml.h:182
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Mensaxe desde a conta &quot;{0}&quot;:"
 
-#: ../mail/mail.error.xml.h:184
+#: ../mail/mail.error.xml.h:183
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr ""
 "Produciuse un fallo ao marcar a conversa para ignorala no cartafol «{0}»"
 
-#: ../mail/mail.error.xml.h:185
+#: ../mail/mail.error.xml.h:184
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr "Produciuse un fallo ao desmarcar o fío como ignorada no cartafol «{0}»"
 
-#: ../mail/mail.error.xml.h:186
+#: ../mail/mail.error.xml.h:185
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr ""
 "Produciuse un fallo ao marcar a sub-conversa como ignorada nun cartafol «{0}»"
 
-#: ../mail/mail.error.xml.h:187
+#: ../mail/mail.error.xml.h:186
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr ""
 "Produciuse un fallo ao desmarcar a subconversa como ignorada no cartafol "
 "«{0}»"
 
-#: ../mail/mail.error.xml.h:188
+#: ../mail/mail.error.xml.h:187
 msgid "Remote content download had been blocked for this message."
 msgstr "A carga do contido remoto foi bloqueada para este mensaxe."
 
-#: ../mail/mail.error.xml.h:189
+#: ../mail/mail.error.xml.h:188
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -18479,20 +18865,34 @@ msgstr ""
 "contido remota para este emisor ou sitios usados."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:191
+#: ../mail/mail.error.xml.h:190
 msgid "{0}, Completed on {1}"
 msgstr "{0}, completado o {1}"
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:193
+#: ../mail/mail.error.xml.h:192
 msgid "{0} by {1}"
 msgstr "{0} por {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:195
+#: ../mail/mail.error.xml.h:194
 msgid "Overdue: {0} by {1}"
 msgstr "Vencido: {0} o {1}"
 
+#: ../mail/mail.error.xml.h:196
+msgid "This message note has been changed, but has not been saved."
+msgstr "Esta nota de mensaxe foi cambiado, pero non foi gardada."
+
+#. Translators: {0} is the name of the folder where the delete of the message note failed.
+#: ../mail/mail.error.xml.h:199
+msgid "Failed to delete message note in folder '{0}'"
+msgstr "Produciuse un fallo ao eliminar a nota do mensaxe no cartafol «{0}»"
+
+#. Translators: {0} is the name of the folder where the store of the message note failed.
+#: ../mail/mail.error.xml.h:201
+msgid "Failed to store message note in folder '{0}'"
+msgstr "Produciuse un fallo ao almacenar a nota do mensaxe no cartafol «{0}»"
+
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Cancelando…"
@@ -18545,89 +18945,89 @@ msgstr "Editar o cartafol de busca"
 msgid "New Search Folder"
 msgstr "Novo cartafol de busca"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:294
 msgid "Unseen"
 msgstr "Sen ler"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:295
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:293
+#: ../mail/message-list.c:296
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:294
+#: ../mail/message-list.c:297
 msgid "Forwarded"
 msgstr "Reencamiñada"
 
-#: ../mail/message-list.c:295
+#: ../mail/message-list.c:298
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensaxes sen ler"
 
-#: ../mail/message-list.c:296
+#: ../mail/message-list.c:299
 msgid "Multiple Messages"
 msgstr "Múltiples mensaxes"
 
-#: ../mail/message-list.c:309
+#: ../mail/message-list.c:312
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:313
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:314
+#: ../mail/message-list.c:317
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:315
+#: ../mail/message-list.c:318
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:6034
+#: ../mail/message-list.c:464 ../mail/message-list.c:6168
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2060 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:2050
+#: ../mail/message-list.c:2069
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
 # (pofilter) variables: do not translate: %a, %l, %p
-#: ../mail/message-list.c:2062
+#: ../mail/message-list.c:2081
 msgid "%a %l:%M %p"
 msgstr "O %a ás %l:%M %p"
 
 # (pofilter) variables: do not translate: %b, %l, %p
-#: ../mail/message-list.c:2070
+#: ../mail/message-list.c:2089
 msgid "%b %d %l:%M %p"
 msgstr "O %b %d ás %l:%M %p"
 
 # (pofilter) variables: do not translate: %b
-#: ../mail/message-list.c:2072
+#: ../mail/message-list.c:2091
 msgid "%b %d %Y"
 msgstr "O %b %d de %Y"
 
-#: ../mail/message-list.c:2957
+#: ../mail/message-list.c:2997
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensaxes visíbeis"
 
-#: ../mail/message-list.c:3622 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3699 ../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:4978
+#: ../mail/message-list.c:5105
 msgid "Follow-up"
 msgstr "Seguimento"
 
-#: ../mail/message-list.c:5971
+#: ../mail/message-list.c:6107
 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 "
@@ -18639,7 +19039,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:5979
+#: ../mail/message-list.c:6115
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes neste cartafol."
 
@@ -18671,47 +19071,51 @@ msgstr "Mensaxes para"
 msgid "Subject - Trimmed"
 msgstr "Asunto - Recortado"
 
+#: ../mail/message-list.etspec.h:21 ../plugins/save-calendar/csv-format.c:374
+msgid "UID"
+msgstr "UID"
+
 #: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
 msgid "Any header"
 msgstr "Calquera cabeceira"
 
-#: ../mail/searchtypes.xml.in.h:54
+#: ../mail/searchtypes.xml.in.h:57
 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:2136
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2159
 msgid "Recipients contain"
 msgstr "Os destinatarios conteñen"
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2129
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2152
 msgid "Message contains"
 msgstr "A mensaxe contén"
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2150
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2173
 msgid "Subject contains"
 msgstr "O asunto contén"
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2143
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2166
 msgid "Sender contains"
 msgstr "O remitente contén"
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2115
+#: ../mail/searchtypes.xml.in.h:62
+#: ../modules/mail/e-mail-shell-view-actions.c:2138
 msgid "Body contains"
 msgstr "O corpo contén"
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2122
+#: ../mail/searchtypes.xml.in.h:63
+#: ../modules/mail/e-mail-shell-view-actions.c:2145
 msgid "Free form expression"
 msgstr "Expresión libre de forma"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../modules/addressbook/autocompletion-config.c:122
-#: ../modules/mail/em-mailer-prefs.c:1552
+#: ../modules/mail/em-mailer-prefs.c:1558
 msgid "_Table column:"
 msgstr "Columna da _táboa:"
 
@@ -18752,7 +19156,7 @@ msgid "Contact information for %s"
 msgstr "Información do contacto %s"
 
 #: ../modules/addressbook/e-book-shell-backend.c:258
-#: ../modules/addressbook/e-book-shell-view-actions.c:124
+#: ../modules/addressbook/e-book-shell-view-actions.c:139
 msgid "New Address Book"
 msgstr "Nova axenda de enderezos"
 
@@ -18762,7 +19166,7 @@ msgid "_Contact"
 msgstr "_Contacto"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/addressbook/e-book-shell-view-actions.c:1045
 msgid "Create a new contact"
 msgstr "Crear un contacto novo"
 
@@ -18772,7 +19176,7 @@ msgid "Contact _List"
 msgstr "_Lista de contactos"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
 msgid "Create a new contact list"
 msgstr "Crear unha lista de contactos nova"
 
@@ -18782,251 +19186,267 @@ msgid "Address _Book"
 msgstr "_Axenda de enderezos"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "Create a new address book"
 msgstr "Crear unha axenda de enderezos nova"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:197
+#: ../modules/addressbook/e-book-shell-view-actions.c:212
 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:520
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:535
+#: ../modules/addressbook/e-book-shell-view-actions.c:831
 msgid "Save as vCard"
 msgstr "Gardar como vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:938
 msgid "Co_py All Contacts To..."
 msgstr "Co_piar todos os contactos a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 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:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:945
 msgid "D_elete Address Book"
 msgstr "_Eliminar a axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "Delete the selected address book"
 msgstr "Eliminar a axenda seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
+msgid "_Manage Address Book groups..."
+msgstr "_Xestionar grupos da axenda de enderezos…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
+#: ../modules/calendar/e-task-shell-view-actions.c:721
+msgid "Manage task list groups order and visibility"
+msgstr "Xestionar a orde e visibilidade dos grupos das listas de tarefas "
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver todos os contactos a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 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:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "Address _Book Properties"
 msgstr "Propiedades da a_xenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 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:958
-#: ../modules/calendar/e-cal-shell-view-actions.c:1254
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "Refresh the selected address book"
 msgstr "Actualizar o caderno de enderezos seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:965
+#: ../modules/addressbook/e-book-shell-view-actions.c:987
 msgid "Address Book _Map"
 msgstr "_Mapa do caderno de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:967
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 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:972
-#: ../modules/calendar/e-cal-shell-view-actions.c:1261
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:994
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 #: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Rename..."
 msgstr "_Renomear…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:974
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "Rename the selected address book"
 msgstr "Renomear a axenda de enderezos seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Stop loading"
 msgstr "Deter a carga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:986
+#: ../modules/addressbook/e-book-shell-view-actions.c:1008
 msgid "_Copy Contact To..."
 msgstr "_Copiar o contacto a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1010
 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:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:1015
 msgid "_Delete Contact"
 msgstr "E_liminar o contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1000
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
 msgid "_Find in Contact..."
 msgstr "_Buscar no contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1002
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
 msgid "Search for text in the displayed contact"
 msgstr "Buscar un texto no contacto mostrado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1007
+#: ../modules/addressbook/e-book-shell-view-actions.c:1029
 msgid "_Forward Contact..."
 msgstr "_Reencamiñar o contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../modules/addressbook/e-book-shell-view-actions.c:1031
 msgid "Send selected contacts to another person"
 msgstr "Enviar os contactos seleccionados a outra persoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1014
+#: ../modules/addressbook/e-book-shell-view-actions.c:1036
 msgid "_Move Contact To..."
 msgstr "_Mover o contacto a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
 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:1021
+#: ../modules/addressbook/e-book-shell-view-actions.c:1043
 msgid "_New Contact..."
 msgstr "Contacto _novo…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../modules/addressbook/e-book-shell-view-actions.c:1050
 msgid "New Contact _List..."
 msgstr "_Lista de contactos nova…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/addressbook/e-book-shell-view-actions.c:1057
 msgid "_Open Contact"
 msgstr "Abrir _o contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1037
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/addressbook/e-book-shell-view-actions.c:1064
 msgid "_Send Message to Contact..."
 msgstr "_Enviar unha mensaxe ao contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1044
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Send a message to the selected contacts"
 msgstr "Enviar unha mensaxe aos contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Actions"
 msgstr "_Accións"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
-#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/addressbook/e-book-shell-view-actions.c:1080
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-task-shell-view-actions.c:819
 #: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "Vista _previa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1079
+#: ../modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-memo-shell-view-actions.c:682
+#: ../modules/calendar/e-task-shell-view-actions.c:836
+msgid "_Manage groups..."
+msgstr "_Xestionar grupos…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1105
 msgid "Address Book Map"
 msgstr "Mapa do caderno de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1111
+#: ../modules/addressbook/e-book-shell-view-actions.c:1137
 msgid "Contact _Preview"
 msgstr "Vista _previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
+#: ../modules/addressbook/e-book-shell-view-actions.c:1139
 msgid "Show contact preview window"
 msgstr "Mostrar a xanela de vista previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
+#: ../modules/addressbook/e-book-shell-view-actions.c:1145
 msgid "Show _Maps"
 msgstr "Mostrar _mapas"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1121
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 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:1140
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:857
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../modules/addressbook/e-book-shell-view-actions.c:1166
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/mail/e-mail-shell-view-actions.c:2040
 msgid "_Classic View"
 msgstr "Vista _clásica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1142
+#: ../modules/addressbook/e-book-shell-view-actions.c:1168
 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:1147
-#: ../modules/calendar/e-memo-shell-view-actions.c:699
-#: ../modules/calendar/e-task-shell-view-actions.c:864
-#: ../modules/mail/e-mail-shell-view-actions.c:2039
+#: ../modules/addressbook/e-book-shell-view-actions.c:1173
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/mail/e-mail-shell-view-actions.c:2047
 msgid "_Vertical View"
 msgstr "Vista _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1149
+#: ../modules/addressbook/e-book-shell-view-actions.c:1175
 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:1164
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:716
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:1190
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:968
 msgid "Unmatched"
 msgstr "Sen coincidencias"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
-#: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:2108
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
+#: ../modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../modules/calendar/e-memo-shell-view-actions.c:777
+#: ../modules/calendar/e-task-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:2131
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/addressbook/e-book-shell-view-actions.c:1233
 msgid "Print all shown contacts"
 msgstr "Imprimir os contactos mostrados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1214
+#: ../modules/addressbook/e-book-shell-view-actions.c:1240
 msgid "Preview the contacts to be printed"
 msgstr "Previsualizar os contactos que se van imprimir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1221
+#: ../modules/addressbook/e-book-shell-view-actions.c:1247
 msgid "Print selected contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1236
+#: ../modules/addressbook/e-book-shell-view-actions.c:1262
 msgid "S_ave Address Book as vCard"
 msgstr "G_ardar a axenda de enderezos como VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../modules/addressbook/e-book-shell-view-actions.c:1264
 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:1244
-#: ../modules/addressbook/e-book-shell-view-actions.c:1254
+#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../modules/addressbook/e-book-shell-view-actions.c:1280
 msgid "_Save as vCard..."
 msgstr "_Gardar como vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+#: ../modules/addressbook/e-book-shell-view-actions.c:1272
 msgid "Save selected contacts as a vCard"
 msgstr "Gardar os contactos seleccionados como unha VCard"
 
@@ -19304,67 +19724,82 @@ msgstr "Bogofilter"
 msgid "Junk filter using Bogofilter"
 msgstr "Filtro de spam usando Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
+#: ../modules/book-config-google/evolution-book-config-google.c:92
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:993
+#: ../modules/cal-config-google/e-cal-config-google.c:177
+#: ../modules/cal-config-google/e-cal-config-gtasks.c:117
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:361
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:396
+msgid "User name cannot be empty"
+msgstr "O nome de usuario non pode estar baleiro"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
 msgid "Standard LDAP Port"
 msgstr "Porto LDAP estándar"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:618
-msgid "LDAP over SSL (deprecated)"
-msgstr "LDAP sobre SSL (obsoleto)"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:631
+msgid "LDAP over SSL/TLS (deprecated)"
+msgstr "LDAP sobre SSL/TLS (obsoleto)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
 msgid "Microsoft Global Catalog"
 msgstr "Catálogo global de Microsoft"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
-msgid "Microsoft Global Catalog over SSL"
-msgstr "Catálogo global de Microsoft sobre SSL"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+msgid "Microsoft Global Catalog over SSL/TLS"
+msgstr "Catálogo global de Microsoft sobre SSL/TLS"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:567
 msgid "Connecting to LDAP"
 msgstr "Conecando a LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:584
 msgid "Server Information"
 msgstr "Información do servidor"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:611
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:185
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:140
+msgid "Port number is not valid"
+msgstr "O número de porto non é válido"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:634
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (recomendado)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:636
 msgid "Encryption:"
 msgstr "Cifrado:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:660
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:255
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "Anonymous"
 msgstr "Anonimamente"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "Using email address"
 msgstr "Usando enderezo de correo"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Using distinguished name (DN)"
 msgstr "Empregar o nome distintivo (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Method:"
 msgstr "Método:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -19375,36 +19810,36 @@ msgstr ""
 "anónimo ao servidor LDAP."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:711
 msgid "Using LDAP"
 msgstr "Usando LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:728
 #: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Buscando"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:750
 msgid "Search Base:"
 msgstr "Base de busca:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:754
 msgid "Find Possible Search Bases"
 msgstr "Buscar bases de busca posíbeis"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "One Level"
 msgstr "Un nivel"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Subtree"
 msgstr "Subárbore"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
 msgid "Search Scope:"
 msgstr "Ámbito da busca:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
 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 "
@@ -19417,26 +19852,32 @@ 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:781
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Search Filter:"
 msgstr "Filtro de busca:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Limit:"
 msgstr "Límite:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
 msgid "contacts"
 msgstr "contactos"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
 msgid "Browse until limit is reached"
 msgstr "Examinar até chegar ao final"
 
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:978
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:342
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:378
+msgid "Server address cannot be empty"
+msgstr "O enderezo do servidor non pode ser baleiro"
+
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
@@ -19447,18 +19888,24 @@ msgstr "URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Evitar o IfMatch (necesario no Apache < 2.2.8)"
 
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:194
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:415
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:184
+msgid "URL is not a valid http:// nor https:// URL"
+msgstr "O URL non é un URL válido http:// nin https://";
+
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
-#: ../modules/cal-config-google/e-google-chooser-button.c:213
+#: ../modules/cal-config-google/e-google-chooser-button.c:224
 msgid "Choose a Calendar"
 msgstr "Elixir un calendario"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
-#: ../modules/cal-config-google/e-google-chooser-button.c:217
+#: ../modules/cal-config-google/e-google-chooser-button.c:228
 msgid "Choose a Memo List"
 msgstr "Elixir unha lista de notas"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
-#: ../modules/cal-config-google/e-google-chooser-button.c:221
+#: ../modules/cal-config-google/e-google-chooser-button.c:232
 msgid "Choose a Task List"
 msgstr "Elixir unha lista de tarefas"
 
@@ -19490,7 +19937,7 @@ msgstr "Seleccione a axenda de enderezos a usar."
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Usar no cartafol Cumpreanos e aniversarios"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:145
+#: ../modules/cal-config-google/e-google-chooser-button.c:143
 msgid "Default User Calendar"
 msgstr "Calendario do usuario por omisión"
 
@@ -19546,6 +19993,10 @@ msgstr "Kelvin (K)"
 msgid "Units:"
 msgstr "Unidades:"
 
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:321
+msgid "Location cannot be empty"
+msgstr "A localización non pode estar baleira"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
@@ -19587,90 +20038,80 @@ msgstr "_Importar unha lista de recordatorios"
 msgid "I_mport to Task List"
 msgstr "_Importar na lista de 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
+#: ../modules/calendar/e-cal-base-shell-backend.c:187
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
 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:554
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:556
 #, 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:555
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:557
 #, c-format
 msgid "Moving an event into the calendar '%s'"
 msgstr "Movendo un evento nun calendario «%s»"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:562
 #, c-format
 msgid "Copying a memo into the memo list '%s'"
 msgstr "Copiando un recordatorio na lista de recordatorios «%s»"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:563
 #, c-format
 msgid "Moving a memo into the memo list '%s'"
 msgstr "Movendo un recordatorio na lista de recordatorios «%s»"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:566
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:568
 #, c-format
 msgid "Copying a task into the task list '%s'"
 msgstr "Copiando unha tarefa na lista de tarefas «%s»"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:567
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:569
 #, c-format
 msgid "Moving a task into the task list '%s'"
 msgstr "Movendo unha tarefa na lista de tarefas «%s»"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:684
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:686
 msgid "Calendar Selector"
 msgstr "Selector de calendario"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:692
 msgid "Memo List Selector"
 msgstr "Selector de lista de notas"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:697
 msgid "Task List Selector"
 msgstr "Selector de lista de tarefas"
 
-#: ../modules/calendar/e-calendar-preferences.c:520
+#: ../modules/calendar/e-calendar-preferences.c:515
 msgid "Selected Calendars for Alarms"
 msgstr "Seleccionar calendario para alarmas"
 
-#: ../modules/calendar/e-calendar-preferences.c:616
+#: ../modules/calendar/e-calendar-preferences.c:611
 msgid "Meeting Invitations"
 msgstr "Convites a reunións"
 
-#: ../modules/calendar/e-calendar-preferences.c:642
+#: ../modules/calendar/e-calendar-preferences.c:637
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois da acción"
 
-#: ../modules/calendar/e-calendar-preferences.c:656
-#: ../modules/calendar/e-calendar-preferences.c:687
+#: ../modules/calendar/e-calendar-preferences.c:651
+#: ../modules/calendar/e-calendar-preferences.c:682
 msgid "Conflict Search"
 msgstr "Busca de conflitos"
 
 #. Source selector
-#: ../modules/calendar/e-calendar-preferences.c:671
+#: ../modules/calendar/e-calendar-preferences.c:666
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccionar os calendarios nos que buscar conflitos entre reunións"
 
-#: ../modules/calendar/e-calendar-preferences.c:1057
+#: ../modules/calendar/e-calendar-preferences.c:1064
 msgid "Ti_me and date:"
 msgstr "_Hora e data:"
 
-#: ../modules/calendar/e-calendar-preferences.c:1058
+#: ../modules/calendar/e-calendar-preferences.c:1065
 msgid "_Date only:"
 msgstr "Só a _data:"
 
@@ -19714,6 +20155,10 @@ msgstr "Fuso se_cundario:"
 msgid "(Shown in a Day View)"
 msgstr "(Mostrado nunha vista diaria)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Time _zone:"
+msgstr "Fuso _horario:"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "Empregar o fuso horario do s_istema"
@@ -19731,7 +20176,7 @@ msgid "_24 hour"
 msgstr "_24 horas"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Work Week"
 msgstr "Semana laboral"
 
@@ -19753,146 +20198,182 @@ msgstr "A _xornada comeza ás:"
 msgid "_Mon"
 msgstr "_Lun"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "Monday"
+msgstr "Luns"
+
 #. Tuesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "_Mar"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Tuesday"
+msgstr "Martes"
+
 #. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "Mé_r"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Wednesday"
+msgstr "Mércores"
+
 #. Thursday
 #: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "_Xov"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Thursday"
+msgstr "Xoves"
+
 #. Friday
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "_Ven"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "Friday"
+msgstr "Venres"
+
 #. Saturday
 #: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "_Sáb"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Saturday"
+msgstr "Sábado"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "_Dom"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Sunday"
+msgstr "Domingo"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Day _ends:"
 msgstr "A xornada _finaliza ás:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Create events, memos and tasks as _Private by default"
+msgstr "Crear eventos, recordatorios e tarefas como _privados por omisión"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "View Options"
 msgstr "Ver opcións"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
 msgid "_Time divisions:"
 msgstr "Di_visións horarias:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Show appointment end times in week and month view"
 msgstr "_Mostrar as horas finais das citas nas vistas semanal e mensual"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Show appointment _icons in the month view"
+msgstr "Mostrar as _iconas das citas na vista mensual"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir as fins de semana na vista mensual"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Show week _numbers"
 msgstr "Mostrar os _números das semanas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
 "Mostrar en cursiva as actividades con _repeticións no calendario inferior "
 "esquerdo"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Sc_roll Month View by a week"
 msgstr "Desp_razar a vista mensual unha semana"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Alerts"
 msgstr "Alertas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir a confirmación antes de eliminar elementos"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Display"
 msgstr "Mostrar"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Highlight t_asks due today"
 msgstr "Realzar tarefas que _vencen hoxe"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Highlight _overdue tasks"
 msgstr "Realzar tarefas _vencidas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar as tarefas terminadas despois de"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Display reminders in _notification area only"
 msgstr "Mostrar os recordatorios só na área de _notificación"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "Display reminders for completed _tasks"
 msgstr "Mostrar recordatorios para as _tarefas completadas"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Sh_ow a reminder"
 msgstr "M_ostrar un aviso"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Show a _reminder"
 msgstr "Most_rar un aviso"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every anniversary/birthday"
 msgstr "antes de cada aniversario"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 msgid "Default _snooze time (in minutes)"
 msgstr "Tempo de _pospoñer por omisión (en minutos)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Select the calendars for reminder notification"
 msgstr "Seleccionar os calendarios para a notificación de recordatorios"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Default Free/Busy Server"
 msgstr "Servidor predeterminado de dispoñibilidade"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:82
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr ""
 "%u e %d substituiranse polo usuario e o dominio do enderezo de correo "
 "electrónico."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:80
+#: ../modules/calendar/e-calendar-preferences.ui.h:83
 msgid "Publishing Information"
 msgstr "Información de publicación"
 
@@ -19902,7 +20383,7 @@ msgid "_Appointment"
 msgstr "Cit_a"
 
 #: ../modules/calendar/e-cal-shell-backend.c:116
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
@@ -19930,7 +20411,7 @@ msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
 #: ../modules/calendar/e-cal-shell-backend.c:140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
@@ -19938,15 +20419,15 @@ msgstr "Crear un calendario novo"
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:267
+#: ../modules/calendar/e-cal-shell-view-actions.c:285
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:296
+#: ../modules/calendar/e-cal-shell-view-actions.c:314
 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 "
@@ -19958,339 +20439,351 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:331
 msgid "Purge events older than"
 msgstr "Purgar as actividades anteriores a"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:895
+#: ../modules/calendar/e-cal-shell-view-actions.c:926
 msgid "Making an occurrence movable"
 msgstr "Facendo unha ocorrencia moví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:1055
+#: ../modules/calendar/e-cal-shell-view-actions.c:1086
 msgid "event"
 msgstr "actividade"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1088
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:498
+#: ../modules/calendar/e-task-shell-view-actions.c:617
 msgid "Save as iCalendar"
 msgstr "Gardar como iCalendar"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1222
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "_Copy..."
 msgstr "_Copiar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1198
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
 msgid "D_elete Calendar"
 msgstr "_Eliminar o calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1200
+#: ../modules/calendar/e-cal-shell-view-actions.c:1231
 msgid "Delete the selected calendar"
 msgstr "Eliminar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1207
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
 msgid "Go Back"
 msgstr "Atrás"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1214
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 msgid "Go Forward"
 msgstr "Adiante"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1221
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "Select today"
 msgstr "Seleccionar o día de hoxe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1226
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select _Date"
 msgstr "Seleccionar unha _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Select a specific date"
 msgstr "Seleccionar unha data determinada"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1233
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+msgid "_Manage Calendar groups..."
+msgstr "_Xestionar os grupos do calendario…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Manage Calendar groups order and visibility"
+msgstr "Xestionar a orde e visibilidade dos grupos do Calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "_New Calendar"
 msgstr "Calendario _novo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1247
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "Purg_e"
 msgstr "P_urgar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Purge old appointments and meetings"
 msgstr "Purgar as citas e reunións antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1256
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Refresh the selected calendar"
 msgstr "Actualizar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1263
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 msgid "Rename the selected calendar"
 msgstr "Renomear o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1268
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Find _Next"
 msgstr "Buscar _seguinte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1270
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 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:1275
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Find _Previous"
 msgstr "Buscar _anterior"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1277
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 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:1282
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Stop _Running Search"
 msgstr "Dete_r a busca en curso"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Stop currently running search"
 msgstr "Deter a busca actual en execución"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+msgid "Sho_w All Calendars"
+msgstr "Mostrar _todos os calendarios"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Show _Only This Calendar"
 msgstr "M_ostrar só este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1296
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar ao calendario…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1303
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delegate Meeting..."
 msgstr "_Delegar a reunión…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "_Delete Appointment"
 msgstr "_Eliminar esta cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete selected appointments"
 msgstr "Eliminar as citas seleccionadas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1317
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete This _Occurrence"
 msgstr "Eliminar esta _aparición"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete this occurrence"
 msgstr "Eliminar esta aparición"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Delete All Occ_urrences"
 msgstr "Eliminar _todas as aparicións"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Delete all occurrences"
 msgstr "Eliminar todas as aparicións"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1331
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "New All Day _Event..."
 msgstr "Nova _actividade de día completo…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new all day event"
 msgstr "Crear unha actividade nova de día completo"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../modules/calendar/e-task-shell-view-actions.c:698
 msgid "_Forward as iCalendar..."
 msgstr "Reemcamiña_r como iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "New _Meeting..."
 msgstr "_Reunión nova…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Create a new meeting"
 msgstr "Crear unha reunión nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "New _Appointment..."
 msgstr "Cit_a nova…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta aparición _desprazábel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Open Appointment"
 msgstr "_Abrir unha cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "View the current appointment"
 msgstr "Ver a cita actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "_Programar unha reunión…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Converte una cita nunha reunión"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_erter en cita…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Converte unha reunión nunha cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "Quit"
 msgstr "Saír"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1528
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Day"
 msgstr "Día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1530
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 msgid "Show one day"
 msgstr "Mostrar un día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1535
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1537
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Show as list"
 msgstr "Mostrar como unha lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1542
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1544
+#: ../modules/calendar/e-cal-shell-view-actions.c:1597
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1551
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
 msgid "Show one week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1558
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one work week"
 msgstr "Mostrar unha semana laboral"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos próximos sete días"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
 msgid "Occurs Less Than 5 Times"
 msgstr "Acontece menos de 5 veces"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:992
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1009
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Print..."
 msgstr "Imprimir…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Preview the calendar to be printed"
 msgstr "Previsualizar o calendario que se vai imprimir"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
+#: ../modules/calendar/e-memo-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:1040
 msgid "_Save as iCalendar..."
 msgstr "Gardar como iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 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:206
-#: ../modules/calendar/e-memo-shell-view-actions.c:467
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:496
 msgid "memo"
 msgstr "nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:249
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "New _Memo"
 msgstr "Nota _nova"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:65
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo"
 msgstr "Crear unha nota nova"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:256
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "_Open Memo"
 msgstr "_Abrir a nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
 msgid "View the selected memo"
 msgstr "Ver a nota seleccionada"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Open _Web Page"
 msgstr "Abrir a páxina _web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-memopad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Print the selected memo"
 msgstr "Imprimir a nota seleccionada"
 
@@ -20324,58 +20817,58 @@ 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:274
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:615
 msgid "task"
 msgstr "tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
-#: ../modules/calendar/e-task-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:677
 msgid "_Assign Task"
 msgstr "_Asignar unha tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Mark selected tasks as complete"
 msgstr "Marcar as tarefas seleccionadas como terminadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Mark selected tasks as incomplete"
 msgstr "Marcar as tarefas seleccionadas como non terminadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "New _Task"
 msgstr "_Tarefa nova"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:63
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Create a new task"
 msgstr "Crear unha tarefa nova"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "_Open Task"
 msgstr "_Abrir unha tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 msgid "View the selected task"
 msgstr "Ver a tarefa seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:364
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "Print the selected task"
 msgstr "Imprimir a tarefa seleccionada"
 
@@ -20399,84 +20892,97 @@ msgid "Memo Li_st"
 msgstr "Li_sta de notas"
 
 #: ../modules/calendar/e-memo-shell-backend.c:82
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
 msgstr "Crear unha lista de notas nova"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
 msgid "Print Memos"
 msgstr "Imprimir as notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:236
+#: ../modules/calendar/e-memo-shell-view-actions.c:252
 msgid "Memo List Properties"
 msgstr "Propiedades da lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:529
+#: ../modules/calendar/e-memo-shell-view-actions.c:558
 msgid "_Delete Memo"
 msgstr "E_liminar a nota"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:536
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
 msgid "_Find in Memo..."
 msgstr "_Buscar na nota…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:538
+#: ../modules/calendar/e-memo-shell-view-actions.c:567
 msgid "Search for text in the displayed memo"
 msgstr "Buscar un texto na nota mostrada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:557
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "D_elete Memo List"
 msgstr "_Eliminar a lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:559
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete the selected memo list"
 msgstr "Eliminar a lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "_Manage Memo List groups..."
+msgstr "_Xestionar os grupos da lista de recordatorios…"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
+msgid "Manage Memo List groups order and visibility"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "_New Memo List"
 msgstr "Lista de notas _nova"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Refresh the selected memo list"
 msgstr "Actualizar a lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
 msgid "Rename the selected memo list"
 msgstr "Renomear a lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Show _Only This Memo List"
 msgstr "M_ostrar só esta lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#, fuzzy
+msgid "Sho_w All Memo Lists"
+msgstr "M_ostrar só esta lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:722
 msgid "Memo _Preview"
 msgstr "Vista _previa de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
 msgid "Show memo preview pane"
 msgstr "Mostrar o panel de vista previa de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:694
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
 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:701
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 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:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:810
 msgid "Print the list of memos"
 msgstr "Imprimir a lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Preview the list of memos to be printed"
 msgstr "Previsualizar a lista de notas para imprimir"
 
-#: ../modules/calendar/e-memo-shell-view.c:212
+#: ../modules/calendar/e-memo-shell-view.c:219
 msgid "Delete Memos"
 msgstr "Eliminar as notas"
 
-#: ../modules/calendar/e-memo-shell-view.c:214
+#: ../modules/calendar/e-memo-shell-view.c:221
 msgid "Delete Memo"
 msgstr "Eliminar a nota"
 
@@ -20488,45 +20994,45 @@ msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:373
-#: ../modules/calendar/e-task-shell-view-private.c:539
+#: ../modules/calendar/e-task-shell-view-private.c:550
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionada"
 
-#: ../modules/calendar/e-task-shell-backend.c:62
+#: ../modules/calendar/e-task-shell-backend.c:61
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../modules/calendar/e-task-shell-backend.c:69
+#: ../modules/calendar/e-task-shell-backend.c:68
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa asigna_da"
 
-#: ../modules/calendar/e-task-shell-backend.c:71
+#: ../modules/calendar/e-task-shell-backend.c:70
 msgid "Create a new assigned task"
 msgstr "Crear unha tarefa asignada nova"
 
-#: ../modules/calendar/e-task-shell-backend.c:79
+#: ../modules/calendar/e-task-shell-backend.c:78
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Lista de tare_fas"
 
-#: ../modules/calendar/e-task-shell-backend.c:81
-#: ../modules/calendar/e-task-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-backend.c:80
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "Crear unha lista de tarefas nova"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:203
-#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
 msgid "Print Tasks"
 msgstr "Imprimir as tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:259
+#: ../modules/calendar/e-task-shell-view-actions.c:276
 msgid "Task List Properties"
 msgstr "Propiedades da lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:529
+#: ../modules/calendar/e-task-shell-view-actions.c:559
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -20538,107 +21044,116 @@ msgstr ""
 "\n"
 "Está seguro de que desexa eliminalas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:536
+#: ../modules/calendar/e-task-shell-view-actions.c:566
 msgid "Do not ask me again"
 msgstr "Non preguntar de novo."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:654
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "_Delete Task"
 msgstr "E_liminar a tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:661
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "_Find in Task..."
 msgstr "Buscar na tare_fa…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "Search for text in the displayed task"
 msgstr "Buscar un texto na tarefa mostrada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:682
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "D_elete Task List"
 msgstr "_Eliminar a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:684
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "Delete the selected task list"
 msgstr "Eliminar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:689
+#: ../modules/calendar/e-task-shell-view-actions.c:719
+msgid "_Manage Task List groups..."
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_New Task List"
 msgstr "Lista de tarefas _nova"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:705
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Refresh the selected task list"
 msgstr "Actualizar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "Rename the selected task list"
 msgstr "Renomear a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:754
+#, fuzzy
+msgid "Sho_w All Task Lists"
+msgstr "M_ostrar só esta lista de tarefas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Show _Only This Task List"
 msgstr "M_ostrar só esta lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-view-actions.c:775
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "Delete completed tasks"
 msgstr "Eliminar as tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:836
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Task _Preview"
 msgstr "_Previsualizar a tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:838
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Show task preview pane"
 msgstr "Mostrar o panel de vista previa de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:859
+#: ../modules/calendar/e-task-shell-view-actions.c:911
 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:866
+#: ../modules/calendar/e-task-shell-view-actions.c:918
 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:874
+#: ../modules/calendar/e-task-shell-view-actions.c:926
 msgid "Active Tasks"
 msgstr "Tarefas activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:888
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:895
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos próximos sete días"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:902
+#: ../modules/calendar/e-task-shell-view-actions.c:954
 msgid "Overdue Tasks"
 msgstr "Tarefas atrasadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/calendar/e-task-shell-view-actions.c:961
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Print the list of tasks"
 msgstr "Imprimir a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 msgid "Preview the list of tasks to be printed"
 msgstr "Previsualizar a lista de tarefas para imprimir"
 
-#: ../modules/calendar/e-task-shell-view.c:316
+#: ../modules/calendar/e-task-shell-view.c:323
 msgid "Delete Tasks"
 msgstr "Eliminar as tarefas"
 
-#: ../modules/calendar/e-task-shell-view.c:318
+#: ../modules/calendar/e-task-shell-view.c:325
 msgid "Delete Task"
 msgstr "Eliminar a tarefa"
 
-#: ../modules/calendar/e-task-shell-view-private.c:535
+#: ../modules/calendar/e-task-shell-view-private.c:546
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -21347,114 +21862,140 @@ msgstr "Esta xuntanza foi delegada"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "«{0}» delegou a reunión. Desexa engadir o delegado «{1}»?"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:259
+#: ../modules/mail-config/e-mail-config-google-summary.c:261
 msgid "Google Features"
 msgstr "Características de Google"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:270
 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:277
+#: ../modules/mail-config/e-mail-config-google-summary.c:279
 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:286
+#: ../modules/mail-config/e-mail-config-google-summary.c:288
 msgid "You may need to enable IMAP access"
 msgstr "Pode que deba activar o acceso IMAP"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:245
-#: ../modules/mail-config/e-mail-config-local-accounts.c:291
+#: ../modules/mail-config/e-mail-config-local-accounts.c:267
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 msgid "Mail _Directory:"
 msgstr "_Directorio de correo:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Choose a MH mail directory"
 msgstr "Seleccione un directorio de correo MH"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#, fuzzy
+msgid "MH mail directory cannot be empty"
+msgstr "Un ou máis valores non poden ser baleiros."
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
 msgid "Local Delivery _File:"
 msgstr "_Ficheiro de envío local:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Choose a local delivery file"
 msgstr "Seleccione un ficheiro de envío local"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:294
+#, fuzzy
+msgid "Local delivery file cannot be empty"
+msgstr "Un ou máis valores non poden ser baleiros."
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
 msgid "Choose a Maildir mail directory"
 msgstr "Seleccione un cartafol de correo Maildir"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:314
+#: ../modules/mail-config/e-mail-config-local-accounts.c:318
+#, fuzzy
+msgid "Maildir mail directory cannot be empty"
+msgstr "Seleccione un cartafol de correo Maildir"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
 msgid "Spool _File:"
 msgstr "_Ficheiro Spool:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:340
 msgid "Choose a mbox spool file"
 msgstr "Seleccione un ficheiro spool de mbox"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:337
+#: ../modules/mail-config/e-mail-config-local-accounts.c:342
+#, fuzzy
+msgid "Mbox spool file cannot be empty"
+msgstr "Un ou máis valores non poden ser baleiros."
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:363
 msgid "Spool _Directory:"
 msgstr "_Cartafol Spool"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:364
 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:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
+#: ../modules/mail-config/e-mail-config-local-accounts.c:366
+msgid "Mbox spool directory cannot be empty"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:93
 #: ../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:110
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
 #: ../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:123
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
+#. do not reference
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:190
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
 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:163
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:223
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:173
 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:178
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:238
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:188
 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:182
-msgid "SSL on a dedicated port"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:242
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:192
+#, fuzzy
+msgid "TLS on a dedicated port"
 msgstr "SSL nun porto adicado"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:77
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "_Usar binario personalizado, no lugar de «sendmail»"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:81
 msgid "_Custom binary:"
 msgstr "Binario _personalizado:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:100
 msgid "U_se custom arguments"
 msgstr "U_sar argumentos personalizados"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:104
 msgid "Cus_tom arguments:"
 msgstr "Argumentos persona_lizados:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:122
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -21464,15 +22005,21 @@ msgstr ""
 "   %F - é o enderezo de Desde\n"
 "   %R - é o enderezo do remitente"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:137
 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:135
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:210
+#, fuzzy
+msgid "Custom binary cannot be empty"
+msgstr "Un ou máis valores non poden ser baleiros."
+
+#. do not reference
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:145
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor solicita autenticación"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:234
 msgid "T_ype:"
 msgstr "T_ipo:"
 
@@ -21796,137 +22343,157 @@ msgid "Show deleted messages with a line through them"
 msgstr "Mostrar as mensaxes eliminadas riscándoas."
 
 #: ../modules/mail/e-mail-shell-view-actions.c:2004
+#, fuzzy
+msgid "Show _Junk Messages"
+msgstr "Mostrar as mensaxes _eliminadas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#, fuzzy
+msgid "Show junk messages with a red line through them"
+msgstr "Mostrar as mensaxes eliminadas riscándoas."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Group By Threads"
 msgstr "A_grupar por fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Threaded message list"
 msgstr "Lista de mensaxes por fío"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2020
 msgid "_Unmatched Folder Enabled"
 msgstr "Cartafol non _coincidente activado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2014
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 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:2034
+#: ../modules/mail/e-mail-shell-view-actions.c:2042
 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:2041
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 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:2049
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2056
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2063
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos últimos 5 días"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2077
+#: ../modules/mail/e-mail-shell-view-actions.c:2085
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2084
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
+#, fuzzy
+msgid "Messages with Notes"
+msgstr "Mensaxes con anexos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2099
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2091
+#: ../modules/mail/e-mail-shell-view-actions.c:2106
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2098
+#: ../modules/mail/e-mail-shell-view-actions.c:2113
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2157
+#: ../modules/mail/e-mail-shell-view-actions.c:2120
+#, fuzzy
+msgid "Message Thread"
+msgstr "Cabeceira da mensaxe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2180
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteñen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2167
+#: ../modules/mail/e-mail-shell-view-actions.c:2190
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2174
+#: ../modules/mail/e-mail-shell-view-actions.c:2197
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2181
+#: ../modules/mail/e-mail-shell-view-actions.c:2204
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
-#: ../modules/mail/e-mail-shell-view.c:700
+#: ../modules/mail/e-mail-shell-view.c:779
 msgid "All Account Search"
 msgstr "Buscar en todas as contas"
 
-#: ../modules/mail/e-mail-shell-view.c:808
+#: ../modules/mail/e-mail-shell-view.c:887
 msgid "Account Search"
 msgstr "Buscar na conta"
 
-#: ../modules/mail/e-mail-shell-view-private.c:954
+#: ../modules/mail/e-mail-shell-view-private.c:957
 #, 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:963
-#: ../modules/mail/e-mail-shell-view-private.c:980
+#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:983
 #, 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:989
-#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:992
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, 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:1002
+#: ../modules/mail/e-mail-shell-view-private.c:1005
 #, 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:1008
+#: ../modules/mail/e-mail-shell-view-private.c:1011
 #, 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:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1017
 #, 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:1031
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, 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:1549
+#: ../modules/mail/e-mail-shell-view-private.c:1552
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
@@ -21954,7 +22521,7 @@ msgstr "Enviar inmediatamente"
 msgid "Send after 5 minutes"
 msgstr "Despois de 5 minutos"
 
-#: ../modules/mail/em-composer-prefs.c:1280
+#: ../modules/mail/em-composer-prefs.c:1286
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
@@ -21987,11 +22554,11 @@ 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:1554
+#: ../modules/mail/em-mailer-prefs.c:1560
 msgid "_Date header:"
 msgstr "_Cabeceira da data:"
 
-#: ../modules/mail/em-mailer-prefs.c:1555
+#: ../modules/mail/em-mailer-prefs.c:1561
 msgid "Show _original header value"
 msgstr "Mostrar o valor _orixinal da cabeceira"
 
@@ -22097,23 +22664,23 @@ msgstr "Mostrar versión HTML"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Mostra a versión HTML do mensaxe multipart/alternative"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:43
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:37
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se está presente"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
+#: ../modules/prefer-plain/plugin/config-ui.c:38
 msgid "Let Evolution choose the best part to show."
 msgstr "Deixar que o Evolution escolla a mellor parte para mostrar."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:41
 msgid "Show plain text if present"
 msgstr "Mostrar en texto plano se está presente"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
+#: ../modules/prefer-plain/plugin/config-ui.c:42
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -22121,13 +22688,27 @@ msgstr ""
 "Mostrar a parte en texto plano se está presente, doutro xeito permitir que o "
 "Evolution seleccione a mellor parte para mostrar."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:52
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:46
+#, fuzzy
+msgid "Show plain text if present, or HTML source"
+msgstr "Mostrar en texto plano se está presente"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
+#: ../modules/prefer-plain/plugin/config-ui.c:47
+#, fuzzy
+msgid "Show plain text part, if present, otherwise the HTML part source."
+msgstr ""
+"Mostrar a parte en texto plano se está presente, doutro xeito permitir que o "
+"Evolution seleccione a mellor parte para mostrar."
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:93
+#: ../modules/prefer-plain/plugin/config-ui.c:51
 msgid "Only ever show plain text"
 msgstr "Só mostrar en texto plano"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:94
+#: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -22135,11 +22716,11 @@ msgstr ""
 "Mostrar sempre a parte de texto plano e converter en anexos as outras partes "
 "se se solicita."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:104
+#: ../modules/prefer-plain/plugin/config-ui.c:103
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Mostra as partes HTML _suprimidas convertidas en anexos"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:126
+#: ../modules/prefer-plain/plugin/config-ui.c:125
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -22498,7 +23079,7 @@ msgstr "Inspector web de Evolution"
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:465
+#: ../plugins/attachment-reminder/attachment-reminder.c:484
 #: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Palabras chave"
@@ -22690,8 +23271,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:484
-#: ../plugins/external-editor/external-editor.c:486
+#: ../plugins/external-editor/external-editor.c:530
+#: ../plugins/external-editor/external-editor.c:532
 msgid "Compose in External Editor"
 msgstr "Escribir no editor externo"
 
@@ -22811,56 +23392,66 @@ msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr ""
 "O ficheiro que seleccionou non semella ser unha imaxe PNG correcta. Erro: {0}"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Get List _Archive"
 msgstr "Obter o _arquivo da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Get an archive of the list this message belongs to"
 msgstr "Obter un arquivo da lista á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#, fuzzy
+msgid "Copy _Message Archive URL"
+msgstr "Fonte da _mensaxe"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#, fuzzy
+msgid "Copy direct URL for the selected message in its archive"
+msgstr "Redireccionar a alguén a mensaxe seleccionada"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "Get List _Usage Information"
 msgstr "Obter a información sobre o _uso da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Obter a información sobre o uso da lista á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "Contact List _Owner"
 msgstr "Pr_opietario da lista de contactos"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 "Contactar co propietario da lista de correo á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "_Post Message to List"
 msgstr "_Publicar unha mensaxe na lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:410
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Publicar unha mensaxe na lista de correo á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "_Subscribe to List"
 msgstr "_Subscribirse á lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Subscribirse á lista de correo á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
 msgid "_Unsubscribe from List"
 msgstr "Eliminar a s_ubscrición da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Eliminar a subscrición da lista de correo á que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
 msgid "Mailing _List"
 msgstr "_Lista de correo"
 
@@ -22989,31 +23580,31 @@ msgstr "Novo correo en Evolution"
 msgid "Show %s"
 msgstr "Mostrar %s"
 
-#: ../plugins/mail-notification/mail-notification.c:685
+#: ../plugins/mail-notification/mail-notification.c:687
 msgid "_Play sound when a new message arrives"
 msgstr "Re_producir un son cando chegue correo novo"
 
-#: ../plugins/mail-notification/mail-notification.c:717
+#: ../plugins/mail-notification/mail-notification.c:719
 msgid "_Beep"
 msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:730
+#: ../plugins/mail-notification/mail-notification.c:732
 msgid "Use sound _theme"
 msgstr "Usar un _tema sonoro"
 
-#: ../plugins/mail-notification/mail-notification.c:749
+#: ../plugins/mail-notification/mail-notification.c:751
 msgid "Play _file:"
 msgstr "Reproducir o _ficheiro:"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:835
+#: ../plugins/mail-notification/mail-notification.c:837
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar as mensaxes novas só na caixa de _entrada"
 
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:853
 msgid "Show _notification when a new message arrives"
 msgstr "Mostrar _notificacións cando chegue correo novo"
 
@@ -23026,30 +23617,30 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Notificar a chegada de mensaxes novas."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:229
+#: ../plugins/mail-to-task/mail-to-task.c:196
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Creado desde un correo electrónico por %s"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/mail-to-task/mail-to-task.c:561
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:596
+#: ../plugins/mail-to-task/mail-to-task.c:563
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Editar"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:598
+#: ../plugins/mail-to-task/mail-to-task.c:565
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_Novo"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:583
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -23058,7 +23649,7 @@ msgstr ""
 "O calendario seleccionado xa contén unha actividade «%s». Desexa editar a "
 "actividade antiga?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:586
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -23067,7 +23658,7 @@ msgstr ""
 "A lista de tarefas seleccionadas xa contén unha tarefa «%s». Desexa editar a "
 "tarefa antiga?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:589
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -23076,7 +23667,7 @@ msgstr ""
 "A lista de notas seleccionada xa contén unha nota «%s» . Desexa editar a "
 "nota antiga?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -23091,7 +23682,7 @@ msgstr[1] ""
 "Seleccionou %d correos para convertelos en actividades. Desexa engadilos "
 "todos?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -23104,7 +23695,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Seleccionou %d correos para convertelos en tarefas. Desexa engadilos todos?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:656
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -23117,29 +23708,29 @@ msgstr[0] ""
 msgstr[1] ""
 "Seleccionou %d correos para convertelos en notas. Desexa engadilos todos?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:677
+#: ../plugins/mail-to-task/mail-to-task.c:644
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Desexa continuar convertendo os correos restantes?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:720
 msgid "[No Summary]"
 msgstr "[Sen resumo]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:766
+#: ../plugins/mail-to-task/mail-to-task.c:733
 msgid "Invalid object returned from a server"
 msgstr "O obxecto devolto por un servidor non é válido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:787
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Produciuse un erro ao procesar: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:857
+#: ../plugins/mail-to-task/mail-to-task.c:823
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Non é posíbel abrir o calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:861
+#: ../plugins/mail-to-task/mail-to-task.c:827
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -23147,7 +23738,7 @@ msgstr ""
 "O calendario seleccionado é só de lectura polo que non é posíbel crear un "
 "evento nel. Seleccione outro calendario."
 
-#: ../plugins/mail-to-task/mail-to-task.c:864
+#: ../plugins/mail-to-task/mail-to-task.c:830
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -23155,7 +23746,7 @@ msgstr ""
 "A lista de tarefas seleccionada é só de lectura polo que non é posíbel crear "
 "tarefas nela. Seleccione outra lista de tarefas."
 
-#: ../plugins/mail-to-task/mail-to-task.c:867
+#: ../plugins/mail-to-task/mail-to-task.c:833
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -23163,35 +23754,35 @@ msgstr ""
 "A lista de recordatorios seleccionada é só de lectura polo que non é posíbel "
 "crear un recordatorio nela. Seleccione outra lista de recordatorios."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1269
+#: ../plugins/mail-to-task/mail-to-task.c:1235
 msgid "Create an _Appointment"
 msgstr "Crear unha cit_a"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 msgid "Create a new event from the selected message"
 msgstr "Crear unha actividade nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1276
+#: ../plugins/mail-to-task/mail-to-task.c:1242
 msgid "Create a Mem_o"
 msgstr "Crear unha n_ota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1278
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 msgid "Create a new memo from the selected message"
 msgstr "Crear unha nota nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1283
+#: ../plugins/mail-to-task/mail-to-task.c:1249
 msgid "Create a _Task"
 msgstr "Crear unha _tarefa"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1251
 msgid "Create a new task from the selected message"
 msgstr "Crear unha tarefa nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1293
+#: ../plugins/mail-to-task/mail-to-task.c:1259
 msgid "Create a _Meeting"
 msgstr "Crear unha _reunión"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1295
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a new meeting from the selected message"
 msgstr "Crear unha reunión nova a partir da mensaxe seleccionada"
 
@@ -23199,18 +23790,20 @@ msgstr "Crear unha reunión nova a partir da mensaxe seleccionada"
 msgid "Convert a mail message to a task."
 msgstr "Converter unha mensaxe nunha tarefa."
 
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Importación do PST do Outlook"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-msgid "Outlook personal folders (.pst)"
-msgstr "Cartafoles persoais do Outlook (.pst)"
-
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "Importar as mensaxes do Outlook desde un ficheiro PST"
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook personal folders (.pst)"
+msgstr "Cartafoles persoais do Outlook (.pst)"
+
 #: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "_Correo"
@@ -23399,10 +23992,6 @@ msgstr "Editar a localización"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:374
-msgid "UID"
-msgstr "UID"
-
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "Lista de descricións"
@@ -23542,39 +24131,39 @@ msgstr "Gardar como un _modelo"
 msgid "Save as Template"
 msgstr "Gardar como un modelo"
 
-#: ../shell/e-shell.c:337
+#: ../shell/e-shell.c:380
 msgid "Preparing to go offline..."
 msgstr "Preparando a desconexión…"
 
-#: ../shell/e-shell.c:390
+#: ../shell/e-shell.c:409
 msgid "Preparing to go online..."
 msgstr "Preparando a conexión…"
 
-#: ../shell/e-shell.c:501
+#: ../shell/e-shell.c:520
 msgid "Preparing to quit"
 msgstr "Preparando a saída"
 
-#: ../shell/e-shell.c:507
+#: ../shell/e-shell.c:526
 msgid "Preparing to quit..."
 msgstr "Preparando a saída…"
 
-#: ../shell/e-shell.c:1024
+#: ../shell/e-shell.c:1043
 msgid "Credentials are required to connect to the destination host."
 msgstr "Requírense credenciais para conectarse ao equipo de destino."
 
-#: ../shell/e-shell.c:1203 ../shell/e-shell-window-actions.c:827
+#: ../shell/e-shell.c:1211 ../shell/e-shell-window-actions.c:827
 msgid "New _Window"
 msgstr "_Xanela nova"
 
-#: ../shell/e-shell.c:1214
+#: ../shell/e-shell.c:1222
 msgid "Quick _Reference"
 msgstr "_Referencia rápida"
 
-#: ../shell/e-shell.c:1216 ../shell/e-shell-window-actions.c:764
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:764
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../shell/e-shell.c:1217 ../shell/e-shell-window-actions.c:862
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:862
 msgid "_Quit"
 msgstr "_Saír"
 
@@ -23904,13 +24493,13 @@ msgstr "Seleccionar vista: %s"
 msgid "Delete view: %s"
 msgstr "Eliminar vista: %s"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1748
 msgid "Execute these search parameters"
 msgstr "Executar estes parámetros de busca"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../shell/e-shell-window.c:555
+#: ../shell/e-shell-window.c:567
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "Novo"
@@ -23922,7 +24511,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:199
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -23958,7 +24547,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:223
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -23966,13 +24555,13 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:229
+#: ../shell/main.c:225
 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:318
+#: ../shell/main.c:314
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -23980,39 +24569,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:322
+#: ../shell/main.c:318
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometría indicada á xanela principal"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:322
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:324
 msgid "Ignore network availability"
 msgstr "Ignorar a dispoñibilidade da rede"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche do Evolution"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de todos os engadidos."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:332
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de vista previa de correo, contactos e tarefas."
 
-#: ../shell/main.c:340
+#: ../shell/main.c:336
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Importar URI ou nomes de ficheiros fornecidos como argumentos."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:338
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar a saída dun proceso de execución do Evolution"
 
-#: ../shell/main.c:419
+#: ../shell/main.c:415
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -24021,7 +24610,7 @@ 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:473 ../shell/main.c:478
+#: ../shell/main.c:469 ../shell/main.c:474
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de correo e XIP Evolution"
 
@@ -24435,15 +25024,15 @@ msgstr "Confiar"
 msgid "_Edit Trust"
 msgstr "_Editar a confianza"
 
-#: ../smime/gui/certificate-manager.c:1975
+#: ../smime/gui/certificate-manager.c:1977
 msgid "All PKCS12 files"
 msgstr "Todos os ficheiros PKCS12"
 
-#: ../smime/gui/certificate-manager.c:1992
+#: ../smime/gui/certificate-manager.c:1994
 msgid "All email certificate files"
 msgstr "Todos os ficheiros de certificados de correo"
 
-#: ../smime/gui/certificate-manager.c:2009
+#: ../smime/gui/certificate-manager.c:2011
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros de certificados dunha EA"
 
@@ -24701,6 +25290,238 @@ msgstr "Con _data de vencemento"
 msgid "With _Status"
 msgstr "Con e_stado"
 
+#~ msgid "Edit Reminder"
+#~ msgstr "Editar recordatorio"
+
+#~ msgid "start of appointment"
+#~ msgstr "inicio da cita"
+
+#~ msgid "end of appointment"
+#~ msgstr "fin da cita"
+
+#~ msgid "Add Reminder"
+#~ msgstr "Engadir recordatorio"
+
+#~ msgid "Reminder"
+#~ msgstr "Recordatorio"
+
+#~ msgid "Repeat"
+#~ msgstr "Repetir"
+
+#~ msgid "Mes_sage:"
+#~ msgstr "Mensa_xe:"
+
+#~ msgid "_Sound:"
+#~ msgstr "_Son:"
+
+#~ msgid "Select A File"
+#~ msgstr "Seleccionar un ficheiro"
+
+#~ msgid "Action/Trigger"
+#~ msgstr "Acción/Activador"
+
+#~ msgid "This event has been deleted."
+#~ msgstr "Esta actividade eliminouse."
+
+#~ msgid "This task has been deleted."
+#~ msgstr "Esta tarefa eliminouse."
+
+#~ msgid "This memo has been deleted."
+#~ msgstr "Esta nota eliminouse."
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and close the editor?"
+#~ msgstr ""
+#~ "%s  Realizou modificacións. Desexa ignorar estas modificacións e pechar o "
+#~ "editor?"
+
+#~ msgid "%s  You have made no changes, close the editor?"
+#~ msgstr "%s  Non realizou modificacións. Desexa pechar o editor?"
+
+#~ msgid "This event has been changed."
+#~ msgstr "Esta actividade modificouse"
+
+#~ msgid "This task has been changed."
+#~ msgstr "Esta tarefa modificouse."
+
+#~ msgid "This memo has been changed."
+#~ msgstr "Esta nota modificouse."
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and update the editor?"
+#~ msgstr ""
+#~ "%s  Realizou modificacións. Desexa ignorar estas modificacións e "
+#~ "actualizar o editor?"
+
+#~ msgid "%s  You have made no changes, update the editor?"
+#~ msgstr "%s  Non realizou modificacións. Desexa actualizar o editor?"
+
+#~ msgid "Could not update object"
+#~ msgstr "Non foi posíbel actualizar o obxecto"
+
+#~ msgid "Edit Appointment"
+#~ msgstr "Editar a cita"
+
+#~ msgid "Keep original item?"
+#~ msgstr "Desexa gardar o elemento orixinal?"
+
+#~ msgid "Unable to synchronize with the server"
+#~ msgstr "Non foi posíbel sincronizar co servidor"
+
+#~ msgid "Changes made to this item may be discarded if an update arrives"
+#~ msgstr ""
+#~ "As modificacións realizadas neste elemento pódense rexeitar se chega unha "
+#~ "actualización"
+
+#~ msgid "Unable to use current version!"
+#~ msgstr "Non é posíbel usar a versión actual!"
+
+#~ msgid "Validation error: %s"
+#~ msgstr "Erro de validación: %s"
+
+#~ msgid "Enter Delegate"
+#~ msgstr "Introducir un delegado"
+
+#~ msgid "Delegate To:"
+#~ msgstr "Delegar en:"
+
+#~ msgid "Contacts..."
+#~ msgstr "Contactos…"
+
+#~ msgid "_Recurrence"
+#~ msgstr "_Repetición"
+
+#~ msgid "Make this a recurring event"
+#~ msgstr "Converter en actividade con repeticións"
+
+#~ msgid "Insert advanced send options"
+#~ msgstr "Inserir opcións avanzadas de envío"
+
+#~ msgid "_Free/Busy"
+#~ msgstr "_Dispoñibilidade"
+
+#~ msgid "Print this event"
+#~ msgstr "Imprimir esta actividade"
+
+#~ msgid "This event has reminders"
+#~ msgstr "Esta actividade ten recordatorios"
+
+#~ msgid "Event with no start date"
+#~ msgstr "Actividade sen data de inicio"
+
+#~ msgid "Event with no end date"
+#~ msgstr "Actividade sen data de finalización"
+
+#~ msgid "End date is wrong"
+#~ msgstr "A data de finalización é incorrecta"
+
+#~ msgid "End time is wrong"
+#~ msgstr "A hora de finalización é incorrecta"
+
+#~ msgid "_Delegatees"
+#~ msgstr "_Delegados"
+
+#~ msgid "Atte_ndees"
+#~ msgstr "_Participantes"
+
+#~ msgctxt "eventpage"
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minutos antes da cita"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 hora antes da cita"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 day before appointment"
+#~ msgstr "1 día antes da cita"
+
+#~ msgid "_Time:"
+#~ msgstr "_Hora:"
+
+#~ msgid "Event Description"
+#~ msgstr "Descrición da actividade"
+
+#~ msgid "Print this memo"
+#~ msgstr "Imprimir esta nota"
+
+#~ msgid "Memo's start date is in the past"
+#~ msgstr "A data de inicio da nota xa pasou"
+
+#~ msgid "Organi_zer:"
+#~ msgstr "Organi_zador:"
+
+#~ msgid "T_o:"
+#~ msgstr "_Para:"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "Resu_mo:"
+
+#~ msgid "Could not get a selection to modify."
+#~ msgstr "Non foi posíbel obter unha selección para modificar."
+
+#~ msgid "Could not get a selection to delete."
+#~ msgstr "Non foi posíbel obter unha selección para eliminar."
+
+#~ msgid "Date/Time"
+#~ msgstr "Data e hora"
+
+#~ msgctxt "recurrpage"
+#~ msgid "day(s)"
+#~ msgstr "día(s)"
+
+#~ msgctxt "recurrpage"
+#~ msgid "for"
+#~ msgstr "durante"
+
+#~ msgctxt "recurrpage"
+#~ msgid "until"
+#~ msgstr "até"
+
+#~ msgid "_Send Options"
+#~ msgstr "Opción_s de envío"
+
+#~ msgid "Print this task"
+#~ msgstr "Imprimir esta tarefa"
+
+#~ msgid ""
+#~ "Task cannot be edited, because the selected task list does not support "
+#~ "assigned tasks"
+#~ msgstr ""
+#~ "Non é posíbel editar a tarefa porque a lista de tarefas seleccionada non "
+#~ "admite asignación de tarefas"
+
+#~ msgid "Due date is wrong"
+#~ msgstr "A data de vencemento é incorrecta"
+
+#~ msgid "Time zone:"
+#~ msgstr "Fuso horario:"
+
+#~ msgid "%s at the start of the appointment"
+#~ msgstr "%s ao inicio da cita"
+
+#~ msgid "%s at the end of the appointment"
+#~ msgstr "%s ao finalizar a cita"
+
+#~ msgid "Gnome Calendar"
+#~ msgstr "Calendario do GNOME"
+
+#~ msgid "Download in progress. Do you want to send the mail?"
+#~ msgstr "Hai unha descarga en progreso. Desexa enviar o correo?"
+
+#~ msgid ""
+#~ " There are few attachments getting downloaded. Sending the mail will "
+#~ "cause the mail to be sent without those pending attachments "
+#~ msgstr ""
+#~ " Hai algúns anexos descargándose. Enviar o correo agora fará que se envíe "
+#~ "sen eses anexos pendentes "
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Use Unicode characters for smile_ys"
+#~ msgstr "Usar caracteres Unicode para os sorr_isos"
+
 #~ msgid ""
 #~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
 #~ "\" lines in the \"Messages\" column in vertical view"
@@ -25134,9 +25955,6 @@ msgstr "Con e_stado"
 #~ msgid "Use spamc and spamd programs, if available."
 #~ msgstr "Usar os programas spamc e spamd, se están dispoñíbeis"
 
-#~ msgid "A_vailable Fields:"
-#~ msgstr "Campos _dispoñíbeis:"
-
 #~ msgid "_Show these fields in order:"
 #~ msgstr "_Mostrar estes campos por orde:"
 
@@ -27041,9 +27859,6 @@ msgstr "Con e_stado"
 #~ msgid "SSL is not supported in this build of Evolution"
 #~ msgstr "SSL non é compatíbel con esta versión do Evolution"
 
-#~ msgid "_Authentication Type"
-#~ msgstr "Tipo de _autenticación"
-
 #~ msgid "Re_member password"
 #~ msgstr "Le_mbrar o contrasinal"
 
@@ -27123,9 +27938,6 @@ msgstr "Con e_stado"
 #~ msgid "Birthdays & Anniversaries"
 #~ msgstr "Aniversarios"
 
-#~ msgid "_New Calendar..."
-#~ msgstr "Calendario _novo…"
-
 #~ msgid "Evolution Setup Assistant"
 #~ msgstr "Asistente de configuración do Evolution"
 
@@ -27173,9 +27985,6 @@ msgstr "Con e_stado"
 #~ msgid "User's calendars"
 #~ msgstr "Calendarios do usuario"
 
-#~ msgid "Failed to get server URL."
-#~ msgstr "Produciuse un fallo ao obter o servidor LDAP."
-
 #~ msgid "Searching for user's calendars..."
 #~ msgstr "Buscando os calendarios do usuario…"
 
@@ -27233,9 +28042,6 @@ msgstr "Con e_stado"
 #~ msgid "Force read _only"
 #~ msgstr "Forzar s_ó lectura"
 
-#~ msgid "Local Calendars"
-#~ msgstr "Calendarios locais"
-
 #~ msgid "Add local calendars to Evolution."
 #~ msgstr "Engadir calendarios locais ao Evolution."
 
@@ -27394,9 +28200,6 @@ msgstr "Con e_stado"
 #~ msgid "FIXME"
 #~ msgstr "ARRANXAR"
 
-#~ msgid "Formatting Message..."
-#~ msgstr "Formatando a mensaxe…"
-
 #~ msgid "Retrieving '%s'"
 #~ msgstr "Obtendo «%s»"
 
@@ -27647,9 +28450,6 @@ msgstr "Con e_stado"
 #~ msgid "Use _SSL"
 #~ msgstr "Usar _SSL"
 
-#~ msgid "Local Folders"
-#~ msgstr "Cartafoles locais"
-
 #~ msgid "_Use Secure Connection:"
 #~ msgstr "_Usar unha conexión segura:"
 
@@ -27904,9 +28704,6 @@ msgstr "Con e_stado"
 #~ msgid "Retrieving quota information for folder '%s'"
 #~ msgstr "Obtendo a información da cota do cartafol «%s»"
 
-#~ msgid "Checking Service"
-#~ msgstr "Comprobando o servizo"
-
 #~ msgid "Delete messages in Search Folder \"{0}\"?"
 #~ msgstr "Desexa eliminar as mensaxes do cartafol de busca «{0}»?"
 


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