[evolution] Updated Galician translations



commit f583ad6d58a0f22e445a15c8dc8cd7ad961adc61
Author: Fran Dieguez <fran dieguez mabishu com>
Date:   Mon Mar 2 23:38:25 2015 +0100

    Updated Galician translations

 po/gl.po | 3784 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2018 insertions(+), 1766 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 373c1c1..d228e9b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,21 +13,22 @@
 # Fran Diéguez <frandieguez gnome org>, 2009, 2010, 2011, 2012.
 # Leandro Regueiro <leandro regueiro gmail com>, 2012.
 # Fran Dieguez <frandieguez gnome org>, 2012, 2013, 2014, 2015.
+#
 #: ../shell/main.c:503
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-12 00:41+0100\n"
-"PO-Revision-Date: 2015-01-12 01:11+0200\n"
+"POT-Creation-Date: 2015-03-02 21:56+0100\n"
+"PO-Revision-Date: 2015-03-02 23:37+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
-"Language-Team: gnome-l10n-gl gnome org\n"
+"Language-Team: Galician <>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Gtranslator 2.91.6\n"
 "X-Project-Style: gnome\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
@@ -205,7 +206,7 @@ msgstr ""
 #: ../calendar/gui/dialogs/event-page.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19
 #: ../calendar/gui/dialogs/task-page.ui.h:30
-#: ../e-util/e-mail-signature-manager.c:326
+#: ../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
@@ -445,7 +446,7 @@ msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
-#: ../calendar/gui/e-calendar-view.c:1990
+#: ../calendar/gui/e-calendar-view.c:1996
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -456,7 +457,7 @@ msgstr "Aniversario"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
-#: ../calendar/gui/e-calendar-view.c:1989 ../shell/main.c:125
+#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Aniversario"
 
@@ -495,7 +496,7 @@ msgstr "_Enderezo:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/widgets/eab-contact-display.c:356
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../addressbook/gui/widgets/e-contact-map.c:371
+#: ../addressbook/gui/widgets/e-contact-map.c:369
 msgid "Home"
 msgstr "Particular"
 
@@ -503,7 +504,7 @@ msgstr "Particular"
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:81
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:842
-#: ../addressbook/gui/widgets/e-contact-map.c:384
+#: ../addressbook/gui/widgets/e-contact-map.c:382
 msgid "Work"
 msgstr "Traballo"
 
@@ -511,7 +512,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:3044
+#: ../calendar/gui/e-cal-model.c:3034
 msgid "Other"
 msgstr "Outros"
 
@@ -528,7 +529,7 @@ msgstr "Notas"
 #: ../calendar/gui/dialogs/comp-editor.c:1335
 #: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell-window-actions.c:1086
+#: ../shell/e-shell-window-actions.c:1085
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -555,28 +556,28 @@ msgstr "Opcións"
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:15
 #: ../calendar/gui/dialogs/recurrence-page.c:2322
 #: ../composer/e-composer-actions.c:267 ../e-util/e-activity-bar.c:340
-#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:490
-#: ../e-util/e-attachment-store.c:634 ../e-util/e-attachment-view.c:370
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
+#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:370
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:472 ../e-util/e-html-editor-actions.c:565
+#: ../e-util/e-html-editor-actions.c:480 ../e-util/e-html-editor-actions.c:573
 #: ../e-util/e-image-chooser-dialog.c:171
-#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:468
+#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
 #: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:833 ../e-util/e-web-view.c:3043
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3044
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
 #: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:738
 #: ../mail/mail-send-recv.c:820 ../mail/mail-vfolder-ui.c:148
 #: ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:883
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:277
+#: ../modules/backup-restore/evolution-backup-tool.c:886
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:363
 #: ../modules/cal-config-google/e-google-chooser-dialog.c:187
 #: ../modules/calendar/e-cal-attachment-handler.c:285
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
@@ -585,9 +586,10 @@ msgstr "Opcións"
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
 #: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
-#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:639
-#: ../smime/gui/certificate-manager.c:716
-#: ../smime/gui/certificate-manager.c:940 ../smime/gui/e-cert-selector.c:237
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:729
+#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:1335 ../smime/gui/e-cert-selector.c:237
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -597,13 +599,13 @@ msgstr "_Cancelar"
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
 #: ../calendar/calendar.error.xml.h:47
 #: ../calendar/gui/dialogs/comp-editor.c:1277
-#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:381
-#: ../e-util/e-attachment-store.c:635
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3044
+#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:395
+#: ../e-util/e-attachment-store.c:636
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3045
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
-#: ../smime/gui/certificate-manager.c:640
-#: ../smime/gui/certificate-manager.c:717
+#: ../smime/gui/certificate-manager.c:653
+#: ../smime/gui/certificate-manager.c:730
 msgid "_Save"
 msgstr "_Gardar"
 
@@ -649,7 +651,7 @@ msgstr "Mostrar notas"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 #: ../calendar/gui/dialogs/comp-editor.c:1298
-#: ../e-util/e-html-editor-actions.c:1027
+#: ../e-util/e-html-editor-actions.c:994
 msgid "_Undo"
 msgstr "_Desfacer"
 
@@ -660,7 +662,7 @@ msgstr "Desfacer"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
 #: ../calendar/gui/dialogs/comp-editor.c:1305
-#: ../e-util/e-html-editor-actions.c:985
+#: ../e-util/e-html-editor-actions.c:980
 msgid "_Redo"
 msgstr "_Refacer"
 
@@ -693,10 +695,10 @@ msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
-#: ../e-util/e-attachment-store.c:488 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:473 ../e-util/e-html-editor-actions.c:566
+#: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:481 ../e-util/e-html-editor-actions.c:574
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
-#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:941
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -748,7 +750,7 @@ msgstr "Contacto incorrecto."
 #: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
 #: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
 #: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-html-editor-link-dialog.c:370 ../e-util/e-passwords.c:469
+#: ../e-util/e-html-editor-link-dialog.c:370 ../e-util/e-passwords.c:471
 #: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
 #: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
@@ -761,8 +763,8 @@ 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:166 ../smime/gui/e-cert-selector.c:238
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../shell/main.c:168 ../smime/gui/certificate-manager.c:1336
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_Aceptar"
 
@@ -891,7 +893,7 @@ msgstr "Retirar un enderezo de correo-e da lista"
 #: ../calendar/gui/dialogs/event-page.ui.h:23
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:21
 #: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:424
-#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:366
+#: ../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:54
@@ -952,19 +954,19 @@ 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:1253
+#: ../modules/addressbook/e-book-shell-view-actions.c:1195
 msgid "Name contains"
 msgstr "O nome contén"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+#: ../modules/addressbook/e-book-shell-view-actions.c:1188
 msgid "Email begins with"
 msgstr "O correo comeza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1239
+#: ../modules/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
@@ -997,7 +999,7 @@ msgid "Send a mail message to this address"
 msgstr "Enviar unha mensaxe a este enderezo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:996
+#: ../e-util/e-web-view.c:997
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
@@ -1094,7 +1096,7 @@ msgstr "Videoconferencia"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:827
 #: ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:181
-#: ../modules/calendar/e-cal-shell-view.c:569
+#: ../modules/calendar/e-cal-shell-view.c:570
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Calendario"
@@ -1367,7 +1369,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Pegar os contactos desde o portapapeis"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:1053
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "Eliminar os contactos seleccionados"
 
@@ -1404,14 +1406,15 @@ msgstr "Está seguro de que desexa eliminar este contacto (%s)?"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1331
 #: ../calendar/gui/dialogs/comp-editor.c:1242
 #: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:785
-#: ../e-util/evolution-source-viewer.c:804
+#: ../e-util/evolution-source-viewer.c:805
 #: ../mail/e-mail-account-manager.c:736
-#: ../modules/addressbook/e-book-shell-view-actions.c:1125
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
 #: ../modules/calendar/e-cal-shell-view-actions.c:1434
 #: ../modules/calendar/e-memo-shell-view-actions.c:635
 #: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
-#: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
+#: ../shell/e-shell-window-actions.c:943
+#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "E_liminar"
 
@@ -1609,15 +1612,15 @@ msgstr "_Ampliar"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2230
+#: ../mail/e-mail-reader.c:2360
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:1939
+#: ../e-util/e-html-editor-actions.c:1972
 #: ../e-util/e-html-editor-find-dialog.c:195
-#: ../shell/e-shell-window-actions.c:1021
+#: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "_Buscar"
 
@@ -1735,38 +1738,38 @@ msgstr "Importador de vCard do Evolution"
 msgid "Page %d"
 msgstr "Páxina %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:54
 msgid "Specify the output file instead of standard output"
 msgstr "Indicar o ficheiro de saída en vez da saída estándar"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:54
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "OUTPUTFILE"
 msgstr "FICHEIRO DE SAÍDA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local address book folders"
 msgstr "Listar os cartafoles de axendas de enderezos locais"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Show cards as vcard or csv file"
 msgstr "Mostrar as tarxetas como un ficheiro vcard ou csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:110
+#: ../addressbook/tools/evolution-addressbook-export.c:111
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Erro nos argumentos da liña de ordes. Use a opción --help para ver a "
 "utilización."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "Only support csv or vcard format."
 msgstr "Só é compatíbel cos formatos csv ou vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:155
+#: ../addressbook/tools/evolution-addressbook-export.c:156
 msgid "Unhandled error"
 msgstr "Erro non manipulado"
 
@@ -1893,7 +1896,7 @@ msgstr "IM"
 #. * if a phone number type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
-#: ../addressbook/util/eab-book-util.c:269
+#: ../addressbook/util/eab-book-util.c:271
 msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "Teléfono"
@@ -1942,15 +1945,15 @@ msgstr "_Función de repetición"
 #: ../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-categories-editor.c:278 ../e-util/e-html-editor-actions.c:1057
-#: ../e-util/e-mail-signature-manager.c:356 ../e-util/filter.ui.h:17
+#: ../e-util/e-categories-editor.c:278 ../e-util/e-html-editor-actions.c:1003
+#: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
 #: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170
 #: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:58
 #: ../plugins/attachment-reminder/attachment-reminder.c:562
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/mail-to-task/mail-to-task.c:594
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "_Editar"
@@ -1964,8 +1967,8 @@ msgid "_Dismiss"
 msgstr "_Ignorar"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-queue.c:1844
 #: ../calendar/alarm-notify/alarm-queue.c:1854
-#: ../calendar/alarm-notify/alarm-queue.c:1864
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
 #: ../modules/itip-formatter/itip-view.c:1493
 #: ../modules/itip-formatter/itip-view.c:1604
@@ -2005,49 +2008,49 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
-#: ../calendar/alarm-notify/alarm-queue.c:1834
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1824
 msgid "No summary available."
 msgstr "Non hai un resumo dispoñíbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1706
-#: ../calendar/alarm-notify/alarm-queue.c:1708
+#: ../calendar/alarm-notify/alarm-queue.c:1696
+#: ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñíbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1716
+#: ../calendar/alarm-notify/alarm-queue.c:1706
 msgid "No location information available."
 msgstr "Non hai información da localización dispoñíbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1721
-#: ../calendar/alarm-notify/alarm-queue.c:1825
-#: ../calendar/alarm-notify/alarm-queue.c:2166
+#: ../calendar/alarm-notify/alarm-queue.c:1711
+#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:2156
 msgid "Evolution Reminders"
 msgstr "Recordatorios de Evolution"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1765
+#: ../calendar/alarm-notify/alarm-queue.c:1755
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Ten %d recordatorio"
 msgstr[1] "Ten %d recordatorios"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1984
+#: ../calendar/alarm-notify/alarm-queue.c:1974
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1985 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21
 #: ../mail/mail.error.xml.h:139
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Non"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Si"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1990
+#: ../calendar/alarm-notify/alarm-queue.c:1980
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2064,7 +2067,7 @@ msgstr ""
 "\n"
 "Está seguro de que desexa executar este programa?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2005
+#: ../calendar/alarm-notify/alarm-queue.c:1995
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
@@ -2528,120 +2531,103 @@ msgstr "Produciuse un fallo ao crear un evento nun calendario «{0}»"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:95
-#, fuzzy
 msgid "Failed to create a memo in a memo list '{0}'"
 msgstr ""
-"Produciuse un fallo ao copiar unha recordatorio na lista de recordatorios "
-"«{0}»"
+"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
-#, fuzzy
 msgid "Failed to create a task in a task list '{0}'"
-msgstr "Produciuse un fallo ao copiar unha tarefa na lista de tarefas «{0}»"
+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
-#, fuzzy
 msgid "Failed to modify an event in a calendar '{0}'"
-msgstr "Produciuse un fallo ao mover un evento o calendario «{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
-#, fuzzy
 msgid "Failed to modify a memo in a memo list '{0}'"
 msgstr ""
-"Produciuse un fallo ao mover unha recordatorio na lista de recordatorios "
+"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
-#, fuzzy
 msgid "Failed to modify a task in a task list '{0}'"
-msgstr "Produciuse un fallo ao mover unha tarefa na lista de tarefas «{0}»"
+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
-#, fuzzy
 msgid "Failed to delete an event in a calendar '{0}'"
-msgstr "Produciuse un fallo ao mover un evento o calendario «{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
-#, fuzzy
 msgid "Failed to delete a memo in a memo list '{0}'"
 msgstr ""
-"Produciuse un fallo ao mover unha recordatorio na lista de recordatorios "
+"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
-#, fuzzy
 msgid "Failed to delete a task in a task list '{0}'"
-msgstr "Produciuse un fallo ao mover unha tarefa na lista de tarefas «{0}»"
+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
-#, fuzzy
 msgid "Failed to update an event in a calendar '{0}'"
-msgstr "Produciuse un fallo ao mover un evento o calendario «{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
-#, fuzzy
 msgid "Failed to update a memo in a memo list '{0}'"
 msgstr ""
-"Produciuse un fallo ao mover unha recordatorio na lista de recordatorios "
+"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
-#, fuzzy
 msgid "Failed to update a task in a task list '{0}'"
-msgstr "Produciuse un fallo ao mover unha tarefa na lista de tarefas «{0}»"
+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
-#, fuzzy
 msgid "Failed to send an event to a calendar '{0}'"
-msgstr "Produciuse un fallo ao mover un evento o calendario «{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
-#, fuzzy
 msgid "Failed to send a memo to a memo list '{0}'"
 msgstr ""
-"Produciuse un fallo ao mover unha recordatorio na lista de recordatorios "
-"«{0}»"
+"Produciuse un fallo ao enviar un recordatorio a lista de recordatorios «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:121
-#, fuzzy
 msgid "Failed to send a task to a task list '{0}'"
-msgstr "Produciuse un fallo ao mover unha tarefa na lista de tarefas «{0}»"
+msgstr "Produciuse un fallo ao enviar unha tarefa á lista de tarefas «{0}»"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:123
-#, fuzzy
 msgid "Error creating view for a calendar '{0}'"
-msgstr "Produciuse un erro ao cargar o calendario «{0}»"
+msgstr "Produciuse un erro ao crear uha vista para o calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:125
-#, fuzzy
 msgid "Error creating view for a task list '{0}'"
-msgstr "Produciuse un erro ao cargar a lista de tarefas «{0}»"
+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
-#, fuzzy
 msgid "Error creating view for a memo list '{0}'"
-msgstr "Produciuse un erro ao cargar a lista de recordatorios «{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
 msgid "Failed to copy an event into the calendar '{0}'"
-msgstr "Produciuse un fallo ao copiar un evento o calendario «{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
@@ -2704,28 +2690,22 @@ msgstr "Movendo un recordatorio na lista de recordatorios «{0}»?"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:153
-#, fuzzy
 msgid "Failed to refresh calendar '{0}'"
-msgstr "Desexa eliminar o calendario remoto «{0}»?"
+msgstr "Produciuse un fallo ao actualizar o calendario «{0}»"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:155
-#, fuzzy
 msgid "Failed to refresh task list '{0}'"
-msgstr "Produciuse un fallo ao mover unha tarefa na lista de tarefas «{0}»"
+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
-#, fuzzy
 msgid "Failed to refresh memo list '{0}'"
-msgstr ""
-"Produciuse un fallo ao mover unha recordatorio na lista de recordatorios "
-"«{0}»"
+msgstr "Produciuse un fallo ao actualizar a lista de recordatorios «{0}»"
 
 #: ../calendar/calendar.error.xml.h:158
-#, fuzzy
 msgid "Failed to make an occurrence movable"
-msgstr "Facer esta aparición _desprazábel"
+msgstr "Produciuse un fallo ao crear unha ocorrencia movíbel"
 
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
@@ -2825,20 +2805,20 @@ msgstr "Categoría"
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
 #: ../em-format/e-mail-formatter-print-headers.c:203
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 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:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 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:48
+#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Do Not Exist"
 msgstr "Non existe"
 
@@ -2987,7 +2967,7 @@ 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:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Reminders"
 msgstr "Recordatorios"
 
@@ -3094,14 +3074,14 @@ msgstr "Non foi posíbel sincronizar co servidor"
 #: ../calendar/gui/dialogs/event-editor.c:116
 #: ../calendar/gui/dialogs/event-editor.c:310
 #: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:360 ../e-util/e-html-editor-dialog.c:196
+#: ../composer/e-composer-actions.c:374 ../e-util/e-html-editor-dialog.c:196
 #: ../e-util/e-mail-signature-editor.c:295
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
 #: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
-#: ../smime/gui/certificate-manager.c:1504
+#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
+#: ../smime/gui/certificate-manager.c:2064
 msgid "_Close"
 msgstr "_Pechar"
 
@@ -3111,37 +3091,37 @@ msgstr "Pechar a xanela actual"
 
 #. copy menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:936 ../e-util/e-text.c:2089
+#: ../e-util/e-html-editor-actions.c:959 ../e-util/e-text.c:2089
 #: ../e-util/e-web-view.c:339 ../mail/e-mail-browser.c:133
-#: ../shell/e-shell-window-actions.c:930
+#: ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "_Copiar…"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
 #: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
 #: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:341
-#: ../e-util/e-web-view.c:1325 ../mail/e-mail-browser.c:135
-#: ../shell/e-shell-window-actions.c:932
+#: ../e-util/e-web-view.c:1326 ../mail/e-mail-browser.c:135
+#: ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "Copiar a selección"
 
 #. cut menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:943 ../e-util/e-text.c:2075
-#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:937
+#: ../e-util/e-html-editor-actions.c:966 ../e-util/e-text.c:2075
+#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "Cor_tar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
 #: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1319
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1320
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "Cortar a selección"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
 #: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
-#: ../shell/e-shell-window-actions.c:946
+#: ../shell/e-shell-window-actions.c:945
 msgid "Delete the selection"
 msgstr "Eliminar a selección"
 
@@ -3151,27 +3131,27 @@ msgstr "Ver a axuda"
 
 #. paste menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:971 ../e-util/e-text.c:2101
-#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:965
+#: ../e-util/e-html-editor-actions.c:973 ../e-util/e-text.c:2101
+#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "_Pegar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
 #: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1331
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1332
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1263
-#: ../composer/e-composer-actions.c:414 ../mail/e-mail-reader.c:2132
-#: ../modules/addressbook/e-book-shell-view-actions.c:1263
-#: ../modules/addressbook/e-book-shell-view-actions.c:1277
+#: ../composer/e-composer-actions.c:428 ../mail/e-mail-reader.c:2262
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1219
 msgid "_Print..."
 msgstr "_Imprimir…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2139
-#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269
+#: ../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
@@ -3192,14 +3172,14 @@ msgid "Save current changes and close editor"
 msgstr "Gardar os cambios actuais e pechar o editor"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:992 ../e-util/e-web-view.c:349
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
+#: ../e-util/e-html-editor-actions.c:987 ../e-util/e-web-view.c:349
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
 #: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
@@ -3208,35 +3188,36 @@ msgid "_Classification"
 msgstr "_Clasificación"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1328
-#: ../e-util/e-html-editor-actions.c:1064
+#: ../e-util/e-html-editor-actions.c:1010
 #: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1079
+#: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Ficheiro"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1342
-#: ../e-util/e-html-editor-actions.c:1085
+#: ../e-util/e-html-editor-actions.c:1031
 msgid "_Insert"
 msgstr "_Inserir"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1349
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:418
 msgid "_Options"
 msgstr "_Opcións"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1106 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
+#: ../e-util/e-html-editor-actions.c:1052 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1120
+#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Vista"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1366
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:367
 msgid "_Attachment..."
 msgstr "_Anexo…"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1368
-#: ../composer/e-composer-actions.c:355 ../e-util/e-attachment-view.c:412
+#: ../composer/e-composer-actions.c:369 ../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
@@ -3313,7 +3294,7 @@ msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna a vista do campo de tipo de participante"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2232
-#: ../composer/e-composer-actions.c:573
+#: ../composer/e-composer-actions.c:636
 msgid "Attach"
 msgstr "Anexar"
 
@@ -3326,7 +3307,7 @@ msgstr ""
 "actualización"
 
 #: ../calendar/gui/dialogs/comp-editor.c:3748
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "anexo"
 
@@ -3340,7 +3321,7 @@ msgid "Validation error: %s"
 msgstr "Erro de validación: %s"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:129
-#: ../calendar/gui/e-cal-ops.c:1938
+#: ../calendar/gui/e-cal-ops.c:1940
 msgid "Destination is read only"
 msgstr "O destino é só de lectura"
 
@@ -4053,16 +4034,16 @@ msgstr "A data de conclusión é incorrecta"
 #: ../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:309
+#: ../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:1653 ../calendar/gui/e-task-table.c:525
+#: ../calendar/gui/e-cal-model.c:1643 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:308
+#: ../mail/message-list.c:312
 msgid "Normal"
 msgstr "Normal"
 
@@ -4070,7 +4051,7 @@ msgstr "Normal"
 #: ../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:307
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
 msgid "Low"
 msgstr "Baixa"
 
@@ -4380,17 +4361,17 @@ msgstr "Descrición:"
 msgid "Web Page:"
 msgstr "Páxina Web:"
 
-#: ../calendar/gui/e-cal-data-model.c:1503
+#: ../calendar/gui/e-cal-data-model.c:1608
 #, c-format
 msgid "Creating view for calendar '%s'"
 msgstr "Crear unha vista para o calendario «%s»"
 
-#: ../calendar/gui/e-cal-data-model.c:1507
+#: ../calendar/gui/e-cal-data-model.c:1612
 #, c-format
 msgid "Creating view for task list '%s'"
 msgstr "Creando vistas para a lista de tarefas «%s»"
 
-#: ../calendar/gui/e-cal-data-model.c:1511
+#: ../calendar/gui/e-cal-data-model.c:1616
 #, c-format
 msgid "Creating view for memo list '%s'"
 msgstr "Creando unha vista para a lista de recordatorios «%s»"
@@ -4438,12 +4419,12 @@ msgstr "Prioridade"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3098
+#: ../calendar/gui/e-cal-model.c:3088
 #: ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:33
-#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:35
-#: ../mail/vfoldertypes.xml.in.h:35
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
+#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
 msgid "Status"
 msgstr "Estado"
 
@@ -4480,15 +4461,15 @@ msgstr "Eliminar as actividades seleccionadas"
 msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr "O código pegado non contén datos iCalendar válidos"
 
-#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1538
+#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
 msgid "Default calendar not found"
 msgstr "Calendario por omisión non atopado"
 
-#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1541
+#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
 msgid "Default memo list not found"
 msgstr "Lista de recordatorios por omisión non atopada"
 
-#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1544
+#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
 msgid "Default task list not found"
 msgstr "Lista de tarefas por omisión non atopada"
 
@@ -4526,15 +4507,15 @@ msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1846
+#: ../calendar/gui/e-calendar-view.c:1851
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2222
-#: ../calendar/gui/e-calendar-view.c:2229
-#: ../calendar/gui/e-calendar-view.c:2236
-#: ../calendar/gui/e-calendar-view.c:2239
+#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/e-calendar-view.c:2242
+#: ../calendar/gui/e-calendar-view.c:2245
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -4543,13 +4524,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:2227 ../calendar/gui/e-day-view.c:2939
+#: ../calendar/gui/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2943
 #: ../calendar/gui/e-day-view-top-item.c:859
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: ../calendar/gui/e-calendar-view.c:2249
+#: ../calendar/gui/e-calendar-view.c:2255
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
@@ -4559,15 +4540,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:2253 ../calendar/gui/e-day-view.c:2923
+#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2927
 #: ../calendar/gui/e-day-view-top-item.c:855
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
-#: ../calendar/gui/e-calendar-view.c:2256
 #: ../calendar/gui/e-calendar-view.c:2262
-#: ../calendar/gui/e-calendar-view.c:2265
+#: ../calendar/gui/e-calendar-view.c:2268
+#: ../calendar/gui/e-calendar-view.c:2271
 msgid "%a %d %b %Y"
 msgstr "%a, %d de %b de %Y"
 
@@ -4586,83 +4567,83 @@ msgstr "Data de finalización"
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
 #: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
 #: ../modules/itip-formatter/itip-view.c:3500
-#: ../modules/itip-formatter/itip-view.c:6087
+#: ../modules/itip-formatter/itip-view.c:6088
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../calendar/gui/e-cal-model.c:1184 ../calendar/gui/e-cal-ops.c:586
+#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586
 #: ../calendar/gui/e-cal-ops.c:1209
 #: ../modules/calendar/e-cal-base-shell-backend.c:361
 #, c-format
 msgid "Source with UID '%s' not found"
 msgstr "A orixe con UID «%s» non se atopou"
 
-#: ../calendar/gui/e-cal-model.c:1268 ../calendar/gui/e-cal-ops.c:184
+#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184
 #: ../calendar/gui/e-cal-ops.c:1325
 msgid "Creating an event"
 msgstr "Creando un evento"
 
-#: ../calendar/gui/e-cal-model.c:1272 ../calendar/gui/e-cal-ops.c:188
+#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188
 #: ../calendar/gui/e-cal-ops.c:1329
 msgid "Creating a memo"
 msgstr "Creando un recordatorio"
 
-#: ../calendar/gui/e-cal-model.c:1276 ../calendar/gui/e-cal-ops.c:192
+#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192
 #: ../calendar/gui/e-cal-ops.c:1333
 msgid "Creating a task"
 msgstr "Creando unha tarefa"
 
-#: ../calendar/gui/e-cal-model.c:1655
+#: ../calendar/gui/e-cal-model.c:1645
 msgid "Recurring"
 msgstr "Repetición"
 
-#: ../calendar/gui/e-cal-model.c:1657
+#: ../calendar/gui/e-cal-model.c:1647
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-model.c:1659 ../calendar/gui/e-cal-model-tasks.c:1145
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model.c:1659 ../calendar/gui/e-cal-model-tasks.c:1145
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:3039
+#: ../calendar/gui/e-cal-model.c:3029
 #: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6075
+#: ../modules/itip-formatter/itip-view.c:6076
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-cal-model.c:3040
+#: ../calendar/gui/e-cal-model.c:3030
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6081
+#: ../modules/itip-formatter/itip-view.c:6082
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-cal-model.c:3041
+#: ../calendar/gui/e-cal-model.c:3031
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
 #: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-cal-model.c:3042
+#: ../calendar/gui/e-cal-model.c:3032
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6084
+#: ../modules/itip-formatter/itip-view.c:6085
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-cal-model.c:3043
+#: ../calendar/gui/e-cal-model.c:3033
 msgid "Needs action"
 msgstr "Necesita unha acción"
 
@@ -4816,42 +4797,42 @@ msgstr "Eliminando tarefas"
 msgid "Expunging completed tasks"
 msgstr "Compactando tarefas completadas"
 
-#: ../calendar/gui/e-cal-ops.c:2032
+#: ../calendar/gui/e-cal-ops.c:2034
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "Movendo un evento"
 msgstr[1] "Movendo %d eventos"
 
-#: ../calendar/gui/e-cal-ops.c:2033
+#: ../calendar/gui/e-cal-ops.c:2035
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Copiando un evento"
 msgstr[1] "Copiando %d eventos"
 
-#: ../calendar/gui/e-cal-ops.c:2039
+#: ../calendar/gui/e-cal-ops.c:2041
 #, c-format
 msgid "Moving an memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Movendo un recordatorio"
 msgstr[1] "Movendo %d recordatorios"
 
-#: ../calendar/gui/e-cal-ops.c:2040
+#: ../calendar/gui/e-cal-ops.c:2042
 #, c-format
 msgid "Copying an memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Copiando un recordatorio"
 msgstr[1] "Copiando %d recordatorios"
 
-#: ../calendar/gui/e-cal-ops.c:2046
+#: ../calendar/gui/e-cal-ops.c:2048
 #, c-format
 msgid "Moving an task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Movendo unha tarefa"
 msgstr[1] "Movendo %d tarefas"
 
-#: ../calendar/gui/e-cal-ops.c:2047
+#: ../calendar/gui/e-cal-ops.c:2049
 #, c-format
 msgid "Copying an task"
 msgid_plural "Copying %d tasks"
@@ -4859,16 +4840,16 @@ msgstr[0] "Copiando unha tarefa"
 msgstr[1] "Copiando %d tarefas"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:160
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:168
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:171
+#: ../calendar/gui/e-cell-date-edit-text.c:176
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4878,14 +4859,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2057 ../calendar/gui/e-week-view.c:1690
+#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692
 #: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
 #: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2060 ../calendar/gui/e-week-view.c:1693
+#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
 #: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
@@ -4897,13 +4878,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:2906 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-day-view.c:2910 ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 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:3570
+#: ../calendar/gui/e-day-view.c:3574
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -5141,7 +5122,7 @@ msgstr "Idioma"
 #: ../modules/calendar/e-cal-shell-content.c:1573
 #: ../modules/calendar/e-memo-shell-view-actions.c:180
 #: ../modules/calendar/e-memo-shell-view-actions.c:195
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../modules/calendar/e-memo-shell-view.c:308
 msgid "Memos"
 msgstr "Notas"
 
@@ -5196,11 +5177,11 @@ 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:1072
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 #: ../modules/calendar/e-cal-shell-content.c:1531
 #: ../modules/calendar/e-task-shell-view-actions.c:203
 #: ../modules/calendar/e-task-shell-view-actions.c:218
-#: ../modules/calendar/e-task-shell-view.c:465
+#: ../modules/calendar/e-task-shell-view.c:466
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -5609,13 +5590,13 @@ msgstr "En progreso"
 msgid "% Completed"
 msgstr "% completado"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:30
-#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "é maior que"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:31
-#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
+#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "é menor que"
 
@@ -7362,143 +7343,143 @@ msgstr "_Non mostrar esta mensaxe outra vez"
 msgid "Save as..."
 msgstr "Gardar como…"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:376
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:381
 msgid "New _Message"
 msgstr "_Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:383
 msgid "Open New Message window"
 msgstr "Abrir unha xanela de mensaxe nova"
 
-#: ../composer/e-composer-actions.c:374 ../shell/e-shell-window-actions.c:979
+#: ../composer/e-composer-actions.c:388 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../composer/e-composer-actions.c:376 ../shell/e-shell-window-actions.c:981
+#: ../composer/e-composer-actions.c:390 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "Configurar o Evolution"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:397
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:402
 msgid "Save _As..."
 msgstr "Gardar _como…"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:404
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual con un nome diferente"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:411
 msgid "Character _Encoding"
 msgstr "C_odificación de caracteres"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:435
 msgid "Print Pre_view"
 msgstr "_Vista previa de impresión"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:442
 msgid "Save as _Draft"
 msgstr "Gardar como borra_dor"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:444
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:449
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:451
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:459
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:467
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa súa chave PGP"
 
-#: ../composer/e-composer-actions.c:461
+#: ../composer/e-composer-actions.c:475
 msgid "_Picture Gallery"
 msgstr "_Galería de imaxes"
 
-#: ../composer/e-composer-actions.c:463
+#: ../composer/e-composer-actions.c:477
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Mostrar unha colección de imaxes que poida arrastrar a unha mensaxe"
 
-#: ../composer/e-composer-actions.c:469
+#: ../composer/e-composer-actions.c:483
 msgid "_Prioritize Message"
 msgstr "_Priorizar a mensaxe"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:485
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:477
+#: ../composer/e-composer-actions.c:491
 msgid "Re_quest Read Receipt"
 msgstr "_Solicitar a confirmación de lectura"
 
-#: ../composer/e-composer-actions.c:479
+#: ../composer/e-composer-actions.c:493
 msgid "Get delivery notification when your message is read"
 msgstr "Obter unha notificación de entrega cando se lea a súa mensaxe"
 
-#: ../composer/e-composer-actions.c:485
+#: ../composer/e-composer-actions.c:499
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:487
+#: ../composer/e-composer-actions.c:501
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar esta mensaxe co seu certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:507
 msgid "S/MIME Sig_n"
 msgstr "Asi_nar con S/MIME"
 
-#: ../composer/e-composer-actions.c:495
+#: ../composer/e-composer-actions.c:509
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Asinar esta mensaxe co seu certificado de sinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:563
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:503
+#: ../composer/e-composer-actions.c:565
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna a vista do campo «CCO»"
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:571
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:573
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna a vista do campo «CC»"
 
-#: ../composer/e-composer-actions.c:517
+#: ../composer/e-composer-actions.c:579
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:519
+#: ../composer/e-composer-actions.c:581
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna a vista do campo «Responder a»"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:642
 msgid "Save Draft"
 msgstr "Gardar o borrador"
 
@@ -7547,7 +7528,7 @@ msgid "S_ubject:"
 msgstr "_Asunto:"
 
 #: ../composer/e-composer-header-table.c:811
-#: ../mail/e-mail-config-identity-page.c:487
+#: ../mail/e-mail-config-identity-page.c:505
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
@@ -7576,11 +7557,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:1632 ../composer/e-msg-composer.c:2190
+#: ../composer/e-msg-composer.c:1582 ../composer/e-msg-composer.c:2148
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4406
+#: ../composer/e-msg-composer.c:4391
 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."
@@ -7716,7 +7697,7 @@ msgstr "O erro devolto foi «{0}». É moi posíbel que non se gardase a mensaxe
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Produciuse un erro ao enviar. Que desexa facer?"
 
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:161
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "O informe de erro foi «{0}»."
 
@@ -7753,8 +7734,8 @@ msgstr "Está seguro de que desexa enviar o mensaxe?"
 
 #: ../composer/mail-composer.error.xml.h:38
 msgid ""
-"A keyboard accelerator to send the message had been pressed. Either cancel "
-"message send, if it was done by an accident, or send the message."
+"A keyboard accelerator to send the message has been pressed. Either cancel "
+"sending the message, if it was done by an accident, or send the message."
 msgstr ""
 "Premeuse un acelerador de teclado para enviar un mensaxe. Pode cancelar o "
 "envío do mensaxe, no caso de que fora premido por accidente, ou enviar o "
@@ -7774,7 +7755,7 @@ msgstr "Notificacións de actividades do calendario"
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:81
 msgid "Groupware Suite"
 msgstr "Suite de Groupware"
 
@@ -9024,11 +9005,13 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Number of characters for wrapping"
-msgstr ""
+msgstr "Número de caracteres ao axustar"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid "Will autowrap lines after given number of characters."
 msgstr ""
+"As liñas axustaranse automaticamente despois do número de caracteres "
+"fornecidos."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Save file format for drag-and-drop operation"
@@ -9854,10 +9837,39 @@ msgstr ""
 "de correo remoto. O intervalo debe ser de polo menos 30 segundos."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid "Allow expunge in virtual folders"
+msgstr "Permite purgar cartafoles virtuais"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+msgid ""
+"Enables Expunge in virtual folders, which means that the Folder->Expunge "
+"will be callable in virtual folders, while the expunge itself will be done "
+"in all folders for all deleted messages within the virtual folder, not only "
+"for deleted messages belonging to the virtual folder."
+msgstr ""
+"Activa a purga de cartafoles virtuais, o que significa que Cartafoles-"
+">Purgar estará dispoñíbel en cartafoles virtuais, mentres que a purga como "
+"tal farase en todos os cartafoles para todos os mensaxes eliminados no "
+"cartafol virtual, non só para os mensaxes eliminados que pertenzan ao "
+"cartafol virtual."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+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:209
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+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:210
 msgid "(Deprecated) Default forward style"
 msgstr "(Obsoleto) Estilo de reencamiñamento predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9865,11 +9877,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:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "(Deprecated) Default reply style"
 msgstr "(Obsoleto) Estilo de resposta predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9877,12 +9889,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:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 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:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9890,11 +9902,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:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 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:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -9902,7 +9914,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:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9910,7 +9922,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:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -10221,7 +10233,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:306
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexión"
 
@@ -10319,7 +10331,7 @@ msgstr "Usar só as probas locais de correo lixo (sen DNS)."
 
 #: ../em-format/e-mail-formatter-attachment.c:405
 #: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
-#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10372,7 +10384,7 @@ msgstr "Formatar parte como mensaxe RFC822"
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1271
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1295
 #: ../modules/cal-config-google/e-google-chooser.c:236
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
@@ -10406,18 +10418,19 @@ msgstr "Cifrado con S/MIME"
 msgid "Security"
 msgstr "Seguranza"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:167
+#: ../em-format/e-mail-formatter-quote-headers.c:174
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
 #: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
 #: ../modules/mail/em-mailer-prefs.c:67
+#: ../smime/gui/certificate-manager.c:1630
 msgid "Subject"
 msgstr "Titular"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:186
+#: ../em-format/e-mail-formatter-quote-headers.c:193
 #: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1166
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
@@ -10443,7 +10456,7 @@ msgstr "Formatar parte como HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:197
-#: ../e-util/e-html-editor-actions.c:1382
+#: ../e-util/e-html-editor-actions.c:1408
 msgid "Plain Text"
 msgstr "Texto plano"
 
@@ -10564,7 +10577,7 @@ msgstr ""
 "tempo razoábel."
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../shell/shell.error.xml.h:23 ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "_Visualizar o certificado"
 
@@ -10727,13 +10740,15 @@ msgstr "%s (cancelando)"
 msgid "%s"
 msgstr "%s"
 
+#. Translators: This is a running activity whose percent complete is known.
 #: ../e-util/e-activity.c:275
+#: ../modules/calendar/e-cal-base-shell-content.c:144
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
-#: ../e-util/e-activity-proxy.c:313
-#: ../modules/mail/e-mail-shell-view-actions.c:1817
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1778
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -10746,11 +10761,11 @@ msgstr "Pechar esta mensaxe (Escape)"
 msgid "Failed to create a thread: "
 msgstr "Produciuse un fallo ao crear un fío:"
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
 msgid "Icon View"
 msgstr "Vista de iconas"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
 msgid "List View"
 msgstr "Vista de lista"
 
@@ -10769,7 +10784,7 @@ msgstr "A operación foi cancelada"
 
 #. Translators: Default attachment filename.
 #: ../e-util/e-attachment.c:2264 ../e-util/e-attachment.c:2963
-#: ../e-util/e-attachment.c:3334 ../e-util/e-attachment-store.c:690
+#: ../e-util/e-attachment.c:3334 ../e-util/e-attachment-store.c:691
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -10827,15 +10842,15 @@ msgstr "Nome do f_icheiro:"
 msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:520
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suxerir automaticamente a vista do anexo"
 
-#: ../e-util/e-attachment-handler-image.c:96
+#: ../e-util/e-attachment-handler-image.c:98
 msgid "Could not set as background"
 msgstr "Non foi posíbel definir como fondo"
 
-#: ../e-util/e-attachment-handler-image.c:146
+#: ../e-util/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "Estabelecer como _fondo"
 
@@ -10849,41 +10864,41 @@ msgstr "Cargando"
 msgid "Saving"
 msgstr "Gardando"
 
-#: ../e-util/e-attachment-paned.c:104
+#: ../e-util/e-attachment-paned.c:107
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
 msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../e-util/e-attachment-store.c:485
+#: ../e-util/e-attachment-store.c:486
 msgid "Add Attachment"
 msgstr "Engadir un anexo"
 
-#: ../e-util/e-attachment-store.c:492 ../e-util/e-attachment-store.c:494
+#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
 msgid "A_ttach"
 msgstr "A_nexar"
 
-#: ../e-util/e-attachment-store.c:532
+#: ../e-util/e-attachment-store.c:533
 msgid "Archive selected directories using this format:"
 msgstr "Arquivar os cartafoles seleccionados usando este formato:"
 
-#: ../e-util/e-attachment-store.c:625
+#: ../e-util/e-attachment-store.c:626
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Gardar o anexo"
 msgstr[1] "Gardar os anexos"
 
-#: ../e-util/e-attachment-store.c:652
+#: ../e-util/e-attachment-store.c:653
 msgid "Do _not extract files from the attachment"
 msgstr "Non _extraer os ficheiros do ficheiro anexo"
 
-#: ../e-util/e-attachment-store.c:657
+#: ../e-util/e-attachment-store.c:658
 msgid "Save extracted files _only"
 msgstr "_Só gardar os ficheiros extraídos"
 
-#: ../e-util/e-attachment-store.c:662
+#: ../e-util/e-attachment-store.c:663
 msgid "Save extracted files and the original _archive"
 msgstr "Gardar os ficheiros extraídos e o _arquivo orixinal"
 
@@ -10900,9 +10915,9 @@ msgid "Sa_ve As"
 msgstr "_Gardar como"
 
 #: ../e-util/e-attachment-view.c:400
-#: ../plugins/save-calendar/save-calendar.c:346
-#: ../plugins/save-calendar/save-calendar.c:377
-#: ../plugins/save-calendar/save-calendar.c:408
+#: ../plugins/save-calendar/save-calendar.c:349
+#: ../plugins/save-calendar/save-calendar.c:380
+#: ../plugins/save-calendar/save-calendar.c:411
 msgid "Save _As"
 msgstr "Gardar _como"
 
@@ -10911,12 +10926,12 @@ msgid "A_dd Attachment..."
 msgstr "Enga_dir un anexo…"
 
 #: ../e-util/e-attachment-view.c:417
-#: ../modules/addressbook/e-book-shell-view-actions.c:1129
+#: ../modules/addressbook/e-book-shell-view-actions.c:1071
 #: ../modules/calendar/e-cal-shell-view-actions.c:1240
 #: ../modules/calendar/e-memo-shell-view-actions.c:571
 #: ../modules/calendar/e-task-shell-view-actions.c:696
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1580
+#: ../modules/mail/e-mail-shell-view-actions.c:1650
 msgid "_Properties"
 msgstr "_Propiedades"
 
@@ -10985,19 +11000,19 @@ msgid "Month Calendar"
 msgstr "Calendario mensual"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1343 ../e-util/e-calendar-item.c:2221
+#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1345
+#: ../e-util/e-calendar-item.c:1325
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1382
+#: ../e-util/e-calendar-item.c:1362
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B de %Y"
@@ -11045,7 +11060,7 @@ msgstr "Cate_gorias dispoñíbeis:"
 
 #: ../e-util/e-categories-editor.c:274
 #: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1100
+#: ../shell/e-shell-window-actions.c:1099
 msgid "_New"
 msgstr "_Novo"
 
@@ -11089,7 +11104,7 @@ msgstr "Xa existe unha categoría «%s» na configuración. Use outro nome"
 msgid "popup list"
 msgstr "lista emerxente"
 
-#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:1877
+#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
 msgid "?"
 msgstr "?"
 
@@ -11214,7 +11229,7 @@ msgstr "Introduza o conxunto de caracteres que se vai usar"
 msgid "Other..."
 msgstr "Outro…"
 
-#: ../e-util/e-client-cache.c:1209
+#: ../e-util/e-client-cache.c:1266
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr ""
@@ -11386,7 +11401,7 @@ msgstr "branco"
 
 #: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3656
+#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3857
 #: ../mail/mail-config.ui.h:68
 msgid "Default"
 msgstr "predeterminado"
@@ -11548,7 +11563,7 @@ msgstr "_Indiferente"
 #. Translators: :-!
 #: ../e-util/e-emoticon-chooser.c:51
 msgid "Smi_rk"
-msgstr ""
+msgstr "Sorriso inso_lente"
 
 #. Translators: :"-)
 #: ../e-util/e-emoticon-chooser.c:53
@@ -11563,7 +11578,7 @@ msgstr "Sorriso _grande"
 #. Translators: :-/
 #: ../e-util/e-emoticon-chooser.c:57
 msgid "Uncer_tain"
-msgstr ""
+msgstr "Descoñe_cido"
 
 #. Translators: :-O
 #: ../e-util/e-emoticon-chooser.c:59
@@ -11613,7 +11628,7 @@ msgstr "Cansa_do"
 #. Translators: >:-)
 #: ../e-util/e-emoticon-chooser.c:77
 msgid "De_vilish"
-msgstr ""
+msgstr "De_moníaco"
 
 #. Translators: :-(|)
 #: ../e-util/e-emoticon-chooser.c:79
@@ -11838,820 +11853,743 @@ msgstr "Entrante"
 msgid "Outgoing"
 msgstr "Saínte"
 
-#: ../e-util/e-html-editor-actions.c:56
+#: ../e-util/e-html-editor-actions.c:57
 msgid "Failed to insert HTML file."
 msgstr "Produciuse un fallo ao inserir o ficheiro HTML."
 
-#: ../e-util/e-html-editor-actions.c:93
+#: ../e-util/e-html-editor-actions.c:94
 msgid "Failed to insert text file."
 msgstr "Produciuse un fallo ao inserir o ficheiro de texto."
 
-#: ../e-util/e-html-editor-actions.c:470
+#: ../e-util/e-html-editor-actions.c:478
 msgid "Insert HTML File"
 msgstr "Inserir ficheiro HTML"
 
-#: ../e-util/e-html-editor-actions.c:476
+#: ../e-util/e-html-editor-actions.c:484
 msgid "HTML file"
 msgstr "Ficheiro HTML"
 
-#: ../e-util/e-html-editor-actions.c:503
-#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-actions.c:511
+#: ../e-util/e-html-editor-actions.c:1292
 msgid "Insert Image"
 msgstr "Inserir imaxe"
 
-#: ../e-util/e-html-editor-actions.c:563
+#: ../e-util/e-html-editor-actions.c:571
 msgid "Insert text file"
 msgstr "Inserir ficheiro de texto"
 
-#: ../e-util/e-html-editor-actions.c:569
+#: ../e-util/e-html-editor-actions.c:577
 msgid "Text file"
 msgstr "Ficheiro de texto"
 
-#: ../e-util/e-html-editor-actions.c:938
+#: ../e-util/e-html-editor-actions.c:961
 msgid "Copy selected text to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../e-util/e-html-editor-actions.c:945
+#: ../e-util/e-html-editor-actions.c:968
 msgid "Cut selected text to the clipboard"
 msgstr "Cortar o texto seleccionado ao portapapeis"
 
-#: ../e-util/e-html-editor-actions.c:950
+#. Widgets are treating Ctrl + v shortcut themselves
+#: ../e-util/e-html-editor-actions.c:975
+msgid "Paste text from the clipboard"
+msgstr "Pegar texto desde o portapapeis"
+
+#: ../e-util/e-html-editor-actions.c:982
+msgid "Redo the last undone action"
+msgstr "Refacer a última acción desfeita"
+
+#: ../e-util/e-html-editor-actions.c:996
+msgid "Undo the last action"
+msgstr "Desfacer a última acción"
+
+#: ../e-util/e-html-editor-actions.c:1017
+msgid "For_mat"
+msgstr "For_mato"
+
+#: ../e-util/e-html-editor-actions.c:1024
+msgid "_Paragraph Style"
+msgstr "Estilo do _parágrafo"
+
+#: ../e-util/e-html-editor-actions.c:1038
+#: ../e-util/e-html-editor-image-dialog.c:591
+msgid "_Alignment"
+msgstr "A_liñamento"
+
+#: ../e-util/e-html-editor-actions.c:1045
+msgid "Current _Languages"
+msgstr "_Idiomas dispoñíbeis"
+
+#: ../e-util/e-html-editor-actions.c:1062
 msgid "_Increase Indent"
 msgstr "_Aumentar sangría"
 
-#: ../e-util/e-html-editor-actions.c:952
+#: ../e-util/e-html-editor-actions.c:1064
 msgid "Increase Indent"
 msgstr "Aumentar sangría"
 
-#: ../e-util/e-html-editor-actions.c:957
+#: ../e-util/e-html-editor-actions.c:1069
 msgid "_HTML File..."
 msgstr "Ficheiro _HTML…"
 
-#: ../e-util/e-html-editor-actions.c:964
+#: ../e-util/e-html-editor-actions.c:1076
 msgid "Te_xt File..."
 msgstr "Ficheiro de te_xto…"
 
-#. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:973
-#, fuzzy
-msgid "Paste text from the clipboard"
-msgstr "Pegar as actividades desde o portapapeis"
-
-#: ../e-util/e-html-editor-actions.c:978
+#: ../e-util/e-html-editor-actions.c:1083
 msgid "Paste _Quotation"
-msgstr ""
+msgstr "Pegar _citas"
 
-#: ../e-util/e-html-editor-actions.c:987
-msgid "Redo the last undone action"
-msgstr "Refacer a última acción desfeita"
-
-#: ../e-util/e-html-editor-actions.c:999
+#: ../e-util/e-html-editor-actions.c:1090
 msgid "_Find..."
 msgstr "_Buscar…"
 
-#: ../e-util/e-html-editor-actions.c:1001
+#: ../e-util/e-html-editor-actions.c:1092
 msgid "Search for text"
 msgstr "Busca de texto"
 
-#: ../e-util/e-html-editor-actions.c:1006
+#: ../e-util/e-html-editor-actions.c:1097
 msgid "Find A_gain"
 msgstr "Buscar de _novo"
 
-#: ../e-util/e-html-editor-actions.c:1013
+#: ../e-util/e-html-editor-actions.c:1104
 msgid "Re_place..."
 msgstr "S_ubstituír…"
 
-#: ../e-util/e-html-editor-actions.c:1015
+#: ../e-util/e-html-editor-actions.c:1106
 msgid "Search for and replace text"
 msgstr "Buscar e substituír un texto"
 
-#: ../e-util/e-html-editor-actions.c:1020
+#: ../e-util/e-html-editor-actions.c:1111
 msgid "Check _Spelling..."
 msgstr "Comprobar _ortografía…"
 
-#: ../e-util/e-html-editor-actions.c:1029
-msgid "Undo the last action"
-msgstr "Desfacer a última acción"
-
-#: ../e-util/e-html-editor-actions.c:1034
+#: ../e-util/e-html-editor-actions.c:1118
 msgid "_Decrease Indent"
 msgstr "_Diminuír sangría"
 
-#: ../e-util/e-html-editor-actions.c:1036
+#: ../e-util/e-html-editor-actions.c:1120
 msgid "Decrease Indent"
 msgstr "Diminuír sangría"
 
-#: ../e-util/e-html-editor-actions.c:1041
+#: ../e-util/e-html-editor-actions.c:1125
 msgid "_Wrap Lines"
-msgstr ""
+msgstr "_Axustar liñas"
 
-#: ../e-util/e-html-editor-actions.c:1048
+#: ../e-util/e-html-editor-actions.c:1132
 msgid "Open Inspector"
 msgstr "Abrir inspector"
 
-#: ../e-util/e-html-editor-actions.c:1071
-msgid "For_mat"
-msgstr "For_mato"
-
-#: ../e-util/e-html-editor-actions.c:1078
-#, fuzzy
-msgid "_Paragraph Style"
-msgstr "Estilo da _barra de ferramentas"
-
-#: ../e-util/e-html-editor-actions.c:1092
-#: ../e-util/e-html-editor-image-dialog.c:591
-#, fuzzy
-msgid "_Alignment"
-msgstr "A_liñamento"
-
-#: ../e-util/e-html-editor-actions.c:1099
-#, fuzzy
-msgid "Current _Languages"
-msgstr "I_diomas"
-
 #. Center
-#: ../e-util/e-html-editor-actions.c:1116
+#: ../e-util/e-html-editor-actions.c:1142
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
-msgstr ""
+msgstr "_Centrado"
 
-#: ../e-util/e-html-editor-actions.c:1118
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1144
 msgid "Center Alignment"
-msgstr "A_liñamento"
+msgstr "Aliñamento centrado"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1123
+#: ../e-util/e-html-editor-actions.c:1149
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
-msgstr ""
+msgstr "_Esquerda"
 
-#: ../e-util/e-html-editor-actions.c:1125
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1151
 msgid "Left Alignment"
-msgstr "A_liñamento"
+msgstr "Aliñamento á esquerda"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1130
+#: ../e-util/e-html-editor-actions.c:1156
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
-msgstr ""
+msgstr "_Dereita"
 
-#: ../e-util/e-html-editor-actions.c:1132
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1158
 msgid "Right Alignment"
-msgstr "A_liñamento"
+msgstr "Aliñamento á dereita"
 
-#: ../e-util/e-html-editor-actions.c:1140
+#: ../e-util/e-html-editor-actions.c:1166
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1142
+#: ../e-util/e-html-editor-actions.c:1168
 msgid "HTML editing mode"
-msgstr ""
+msgstr "Modo de edición HTML"
 
-#: ../e-util/e-html-editor-actions.c:1147
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1173
 msgid "Plain _Text"
-msgstr "Texto plano"
+msgstr "_Texto plano"
 
-#: ../e-util/e-html-editor-actions.c:1149
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1175
 msgid "Plain text editing mode"
-msgstr "Modo de texto simple"
+msgstr "Modo de edición de texto plano"
 
-#: ../e-util/e-html-editor-actions.c:1157
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1183
 msgid "_Normal"
-msgstr "Normal"
+msgstr "_Normal"
 
-#: ../e-util/e-html-editor-actions.c:1164
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1190
 msgid "Header _1"
-msgstr "Cabeceira"
+msgstr "Cabeceira _1"
 
-#: ../e-util/e-html-editor-actions.c:1171
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1197
 msgid "Header _2"
-msgstr "Cabeceira"
+msgstr "Cabeceira _2"
 
-#: ../e-util/e-html-editor-actions.c:1178
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1204
 msgid "Header _3"
-msgstr "Cabeceira"
+msgstr "Cabeceira _3"
 
-#: ../e-util/e-html-editor-actions.c:1185
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1211
 msgid "Header _4"
-msgstr "Cabeceira"
+msgstr "Cabeceira _4"
 
-#: ../e-util/e-html-editor-actions.c:1192
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1218
 msgid "Header _5"
-msgstr "Cabeceira"
+msgstr "Cabeceira _5"
 
-#: ../e-util/e-html-editor-actions.c:1199
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1225
 msgid "Header _6"
-msgstr "Cabeceira"
+msgstr "Cabeceira _6"
 
-#: ../e-util/e-html-editor-actions.c:1206
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1232
 msgid "_Preformatted"
-msgstr "Visualizar sen _formato"
+msgstr "_Preformatado"
 
-#: ../e-util/e-html-editor-actions.c:1213
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1239
 msgid "A_ddress"
-msgstr "Enderezo"
+msgstr "En_derezo"
 
-#: ../e-util/e-html-editor-actions.c:1220
+#: ../e-util/e-html-editor-actions.c:1246
 msgid "_Blockquote"
-msgstr ""
+msgstr "_Bloque"
 
-#: ../e-util/e-html-editor-actions.c:1227
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1253
 msgid "_Bulleted List"
-msgstr "_Eliminar a lista de notas"
+msgstr "Lista con _viñetas"
 
-#: ../e-util/e-html-editor-actions.c:1234
+#: ../e-util/e-html-editor-actions.c:1260
 msgid "_Roman Numeral List"
-msgstr ""
+msgstr "Lista de numerais _romanos"
 
-#: ../e-util/e-html-editor-actions.c:1241
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1267
 msgid "Numbered _List"
-msgstr "Obter a _lista"
+msgstr "_Lista numerada"
 
-#: ../e-util/e-html-editor-actions.c:1248
+#: ../e-util/e-html-editor-actions.c:1274
 msgid "_Alphabetical List"
-msgstr ""
+msgstr "Lista _alfabética"
 
-#: ../e-util/e-html-editor-actions.c:1264
-#: ../e-util/e-html-editor-actions.c:1301
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-actions.c:1327
 msgid "_Image..."
-msgstr "Gardar _imaxe…"
+msgstr "_Imaxe…"
 
-#: ../e-util/e-html-editor-actions.c:1271
-#: ../e-util/e-html-editor-actions.c:1308
+#: ../e-util/e-html-editor-actions.c:1297
+#: ../e-util/e-html-editor-actions.c:1334
 msgid "_Link..."
-msgstr ""
+msgstr "_Ligar…"
 
-#: ../e-util/e-html-editor-actions.c:1273
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1299
 msgid "Insert Link"
-msgstr "_Inserir"
+msgstr "Inserir ligazón"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1279
-#: ../e-util/e-html-editor-actions.c:1323
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1305
+#: ../e-util/e-html-editor-actions.c:1349
 msgid "_Rule..."
-msgstr "_Renomear…"
+msgstr "_Regra…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1282
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "Insert Rule"
-msgstr "_Inserir"
+msgstr "Inserir regra"
 
-#: ../e-util/e-html-editor-actions.c:1287
-#: ../e-util/e-html-editor-actions.c:1330
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1313
+#: ../e-util/e-html-editor-actions.c:1356
 msgid "_Table..."
-msgstr "Táboa"
+msgstr "_Táboa…"
 
-#: ../e-util/e-html-editor-actions.c:1289
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1315
 msgid "Insert Table"
-msgstr "_Inserir"
+msgstr "Inserir táboa"
 
-#: ../e-util/e-html-editor-actions.c:1294
+#: ../e-util/e-html-editor-actions.c:1320
 msgid "_Cell..."
-msgstr ""
+msgstr "_Cela…"
 
-#: ../e-util/e-html-editor-actions.c:1315
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1341
 msgid "Pa_ge..."
-msgstr "Gardar _imaxe…"
+msgstr "Pá_xina…"
 
-#: ../e-util/e-html-editor-actions.c:1339
+#: ../e-util/e-html-editor-actions.c:1365
 msgid "Font _Size"
-msgstr ""
+msgstr "_Tamaño de tipo de letra"
 
-#: ../e-util/e-html-editor-actions.c:1346
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1372
 msgid "_Font Style"
-msgstr "Estilo do _reencamiñamento:"
+msgstr "Estilo do _tipo de letra"
 
-#: ../e-util/e-html-editor-actions.c:1353
+#: ../e-util/e-html-editor-actions.c:1379
 msgid "Paste As _Text"
-msgstr ""
+msgstr "Pegar como _texto"
 
-#: ../e-util/e-html-editor-actions.c:1364
+#: ../e-util/e-html-editor-actions.c:1390
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
-msgstr ""
+msgstr "_Negra"
 
-#: ../e-util/e-html-editor-actions.c:1366
+#: ../e-util/e-html-editor-actions.c:1392
 msgid "Bold"
-msgstr ""
+msgstr "Negra"
 
-#: ../e-util/e-html-editor-actions.c:1372
+#: ../e-util/e-html-editor-actions.c:1398
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
-msgstr ""
+msgstr "_Cursiva"
 
-#: ../e-util/e-html-editor-actions.c:1374
+#: ../e-util/e-html-editor-actions.c:1400
 msgid "Italic"
-msgstr ""
+msgstr "Cursiva"
 
-#: ../e-util/e-html-editor-actions.c:1380
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1406
 msgid "_Plain Text"
-msgstr "Texto plano"
+msgstr "Texto _plano"
 
-#: ../e-util/e-html-editor-actions.c:1388
+#: ../e-util/e-html-editor-actions.c:1414
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
-msgstr ""
+msgstr "_Riscado"
 
-#: ../e-util/e-html-editor-actions.c:1390
+#: ../e-util/e-html-editor-actions.c:1416
 msgid "Strikethrough"
-msgstr ""
+msgstr "Riscado"
 
-#: ../e-util/e-html-editor-actions.c:1396
+#: ../e-util/e-html-editor-actions.c:1422
 #: ../e-util/e-html-editor-text-dialog.c:236
-#, fuzzy
 msgid "_Underline"
-msgstr "Sen definir"
+msgstr "_Subliñado"
 
-#: ../e-util/e-html-editor-actions.c:1398
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1424
 msgid "Underline"
-msgstr "Sen definir"
+msgstr "Subliñado"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1408
+#: ../e-util/e-html-editor-actions.c:1434
 msgid "-2"
-msgstr ""
+msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1416
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1442
 msgid "-1"
-msgstr "1"
+msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1424
+#: ../e-util/e-html-editor-actions.c:1450
 msgid "+0"
-msgstr ""
+msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1432
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1458
 msgid "+1"
-msgstr "1"
+msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1440
+#: ../e-util/e-html-editor-actions.c:1466
 msgid "+2"
-msgstr ""
+msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1448
+#: ../e-util/e-html-editor-actions.c:1474
 msgid "+3"
-msgstr ""
+msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1456
+#: ../e-util/e-html-editor-actions.c:1482
 msgid "+4"
-msgstr ""
+msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1475
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1501
 msgid "Cell Contents"
-msgstr "_Contidos"
+msgstr "Contidos da cela"
 
-#: ../e-util/e-html-editor-actions.c:1482
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1508
 msgid "Column"
-msgstr "Engadir unha columna"
+msgstr "Columna"
 
-#: ../e-util/e-html-editor-actions.c:1489
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1515
 msgid "Row"
-msgstr "Baixa"
+msgstr "Fila"
 
-#: ../e-util/e-html-editor-actions.c:1496
-#: ../e-util/e-html-editor-actions.c:1581
+#: ../e-util/e-html-editor-actions.c:1522
+#: ../e-util/e-html-editor-actions.c:1607
 msgid "Table"
 msgstr "Táboa"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1506
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1532
 msgid "Table Delete"
-msgstr "Cela da táboa"
+msgstr "Eliminar táboa"
 
-#: ../e-util/e-html-editor-actions.c:1513 ../e-util/e-text.c:2127
+#: ../e-util/e-html-editor-actions.c:1539 ../e-util/e-text.c:2127
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1521
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1547
 msgid "Table Insert"
-msgstr "Cela da táboa"
+msgstr "Inserir táboa"
 
-#: ../e-util/e-html-editor-actions.c:1528
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1554
 msgid "Properties"
-msgstr "_Propiedades"
+msgstr "Propiedades"
 
-#: ../e-util/e-html-editor-actions.c:1546
+#: ../e-util/e-html-editor-actions.c:1572
 msgid "Column After"
-msgstr ""
+msgstr "Columna posterior"
 
-#: ../e-util/e-html-editor-actions.c:1553
+#: ../e-util/e-html-editor-actions.c:1579
 msgid "Column Before"
-msgstr ""
+msgstr "Columna anterior"
 
-#: ../e-util/e-html-editor-actions.c:1560
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1586
 msgid "Insert _Link"
-msgstr "_Inserir"
+msgstr "Inserir _ligazón"
 
-#: ../e-util/e-html-editor-actions.c:1567
+#: ../e-util/e-html-editor-actions.c:1593
 msgid "Row Above"
-msgstr ""
+msgstr "Fila superior"
 
-#: ../e-util/e-html-editor-actions.c:1574
+#: ../e-util/e-html-editor-actions.c:1600
 msgid "Row Below"
-msgstr ""
+msgstr "Fila inferior"
 
-#: ../e-util/e-html-editor-actions.c:1588
+#: ../e-util/e-html-editor-actions.c:1614
 msgid "Cell..."
-msgstr ""
+msgstr "Cela…"
 
-#: ../e-util/e-html-editor-actions.c:1595
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1621
 msgid "Image..."
-msgstr "Imaxe"
+msgstr "Imaxe…"
 
-#: ../e-util/e-html-editor-actions.c:1602
+#: ../e-util/e-html-editor-actions.c:1628
 msgid "Link..."
-msgstr ""
+msgstr "Ligazón…"
 
-#: ../e-util/e-html-editor-actions.c:1609
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1635
 msgid "Page..."
-msgstr "Buscapersoas"
+msgstr "Páxina…"
 
-#: ../e-util/e-html-editor-actions.c:1616
+#: ../e-util/e-html-editor-actions.c:1642
 msgid "Paragraph..."
-msgstr ""
+msgstr "Parágrafo…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1624
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1650
 msgid "Rule..."
-msgstr "_Nome completo…"
+msgstr "Regra…"
 
-#: ../e-util/e-html-editor-actions.c:1631
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1657
 msgid "Table..."
-msgstr "Táboa"
+msgstr "Táboa…"
 
-#: ../e-util/e-html-editor-actions.c:1638
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1664
 msgid "Text..."
-msgstr "Seleccionar…"
+msgstr "Texto…"
 
-#: ../e-util/e-html-editor-actions.c:1645
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1671
 msgid "Remove Link"
-msgstr "_Retirar"
+msgstr "Eliminar ligazón"
 
-#: ../e-util/e-html-editor-actions.c:1662
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1688
 msgid "Add Word to Dictionary"
-msgstr "Engadir \"%s\" ao Dicionario"
+msgstr "Engadir palabra ao dicionario"
 
-#: ../e-util/e-html-editor-actions.c:1669
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1695
 msgid "Ignore Misspelled Word"
-msgstr "Cor para as palabras escritas incorrecta_mente:"
+msgstr "Ignorar palabra mal escrita"
 
-#: ../e-util/e-html-editor-actions.c:1676
+#: ../e-util/e-html-editor-actions.c:1702
 msgid "Add Word To"
-msgstr ""
+msgstr "Engadir palabra a"
 
-#: ../e-util/e-html-editor-actions.c:1685
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1711
 msgid "More Suggestions"
-msgstr "(non hai suxestións)"
+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:1793
-#, fuzzy, c-format
+#: ../e-util/e-html-editor-actions.c:1819
+#, c-format
 msgid "%s Dictionary"
-msgstr "Engadir \"%s\" ao Dicionario"
+msgstr "Dicionario %s"
 
-#: ../e-util/e-html-editor-actions.c:1873
+#: ../e-util/e-html-editor-actions.c:1906
 msgid "_Emoticon"
-msgstr ""
+msgstr "_Emoticona"
 
-#: ../e-util/e-html-editor-actions.c:1874
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1907
 msgid "Insert Emoticon"
-msgstr "Introducir opcións de envío"
+msgstr "Inserir emoticona"
 
-#: ../e-util/e-html-editor-actions.c:1942
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1975
 msgid "Re_place"
-msgstr "S_ubstituír"
+msgstr "Susb_tituir"
 
-#: ../e-util/e-html-editor-actions.c:1945
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1978
 msgid "_Image"
-msgstr "Imaxe"
+msgstr "_Imaxe"
 
-#: ../e-util/e-html-editor-actions.c:1948
+#: ../e-util/e-html-editor-actions.c:1981
 msgid "_Link"
-msgstr ""
+msgstr "_Ligazón"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1952
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1985
 msgid "_Rule"
-msgstr "Engadir unha regra"
+msgstr "_Regra"
 
-#: ../e-util/e-html-editor-actions.c:1955
+#: ../e-util/e-html-editor-actions.c:1988
 #: ../e-util/e-html-editor-cell-dialog.c:658
-#, fuzzy
 msgid "_Table"
-msgstr "Táboa"
+msgstr "_Táboa"
 
 #: ../e-util/e-html-editor.c:669
 msgid "Paragraph Style"
-msgstr ""
+msgstr "Estilo do parágrafo"
 
 #: ../e-util/e-html-editor.c:683
-#, fuzzy
 msgid "Editing Mode"
-msgstr "Editar recordatorio"
+msgstr "Editar modo"
 
 #: ../e-util/e-html-editor.c:695
-#, fuzzy
 msgid "Font Color"
-msgstr "Quitar cor"
+msgstr "Cor do tipo de letra"
 
 #: ../e-util/e-html-editor.c:713
-#, fuzzy
 msgid "Font Size"
-msgstr "Tamaño"
+msgstr "Tamaño do tipo de letra"
 
 #: ../e-util/e-html-editor-cell-dialog.c:618
 msgid "<b>Scope</b>"
-msgstr ""
+msgstr "<b>Ámbito</b>"
 
 #: ../e-util/e-html-editor-cell-dialog.c:632
 msgid "C_ell"
-msgstr ""
+msgstr "C_ela"
 
 #: ../e-util/e-html-editor-cell-dialog.c:645
 msgid "_Row"
-msgstr ""
+msgstr "_Fila"
 
 #: ../e-util/e-html-editor-cell-dialog.c:671
 msgid "Col_umn"
-msgstr ""
+msgstr "Col_umna"
 
 #: ../e-util/e-html-editor-cell-dialog.c:681
 msgid "<b>Alignment &amp; Behavior</b>"
-msgstr ""
+msgstr "<b>Aliñamento e comportamento</b>"
 
 #: ../e-util/e-html-editor-cell-dialog.c:694
 #: ../e-util/e-html-editor-hrule-dialog.c:384
 #: ../e-util/e-html-editor-table-dialog.c:819
 msgid "Left"
-msgstr ""
+msgstr "Esquerda"
 
 #: ../e-util/e-html-editor-cell-dialog.c:695
 #: ../e-util/e-html-editor-hrule-dialog.c:386
 #: ../e-util/e-html-editor-table-dialog.c:820
 msgid "Center"
-msgstr ""
+msgstr "Centrado"
 
 #: ../e-util/e-html-editor-cell-dialog.c:696
 #: ../e-util/e-html-editor-hrule-dialog.c:388
 #: ../e-util/e-html-editor-table-dialog.c:821
 msgid "Right"
-msgstr ""
+msgstr "Dereita"
 
 #: ../e-util/e-html-editor-cell-dialog.c:704
 msgid "_Horizontal:"
-msgstr ""
+msgstr "_Horizontal:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:712
 #: ../e-util/e-html-editor-image-dialog.c:581
-#, fuzzy
 msgid "Top"
-msgstr "_Inicio"
+msgstr "Arriba"
 
 #: ../e-util/e-html-editor-cell-dialog.c:713
 #: ../e-util/e-html-editor-image-dialog.c:582
-#, fuzzy
 msgid "Middle"
-msgstr "_Apelido 1:"
+msgstr "Medio"
 
 #: ../e-util/e-html-editor-cell-dialog.c:714
 #: ../e-util/e-html-editor-image-dialog.c:583
-#, fuzzy
 msgid "Bottom"
-msgstr "_Final"
+msgstr "Abaixo"
 
 #: ../e-util/e-html-editor-cell-dialog.c:722
-#, fuzzy
 msgid "_Vertical:"
-msgstr "Vista _vertical"
+msgstr "_Vertical:"
 
 #. Wrap Text
 #: ../e-util/e-html-editor-cell-dialog.c:728
-#, fuzzy
 msgid "_Wrap Text"
-msgstr "Texto plano"
+msgstr "_Axustar texto"
 
 #. Header Style
 #: ../e-util/e-html-editor-cell-dialog.c:736
-#, fuzzy
 msgid "_Header Style"
-msgstr "Valor da cabecera"
+msgstr "Estilo da _cabeceira"
 
 #: ../e-util/e-html-editor-cell-dialog.c:750
 #: ../e-util/e-html-editor-image-dialog.c:521
 #: ../e-util/e-html-editor-table-dialog.c:731
 msgid "<b>Layout</b>"
-msgstr ""
+msgstr "<b>Disposición</b>"
 
 #. Width
 #: ../e-util/e-html-editor-cell-dialog.c:761
 msgid "_Width"
-msgstr ""
+msgstr "_Ancho"
 
 #: ../e-util/e-html-editor-cell-dialog.c:800
 msgid "Row S_pan:"
-msgstr ""
+msgstr "Tamaño da _fila:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:814
 msgid "Co_lumn Span:"
-msgstr ""
+msgstr "Tamaño da co_lumna:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:821
 #: ../e-util/e-html-editor-table-dialog.c:835
 msgid "<b>Background</b>"
-msgstr ""
+msgstr "<b>Fondo</b>"
 
 #: ../e-util/e-html-editor-cell-dialog.c:834
 #: ../e-util/e-html-editor-table-dialog.c:848
 msgid "Transparent"
-msgstr ""
+msgstr "Transparente"
 
 #: ../e-util/e-html-editor-cell-dialog.c:842
-#, fuzzy
 msgid "C_olor:"
-msgstr "Cor:"
+msgstr "C_or:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:850
 #: ../e-util/e-html-editor-image-dialog.c:483
 #: ../e-util/e-html-editor-table-dialog.c:864
-#, fuzzy
 msgid "Choose Background Image"
-msgstr "Non foi posíbel definir como fondo"
+msgstr "Escoller cor de fondo"
 
 #: ../e-util/e-html-editor-cell-dialog.c:855
 #: ../e-util/e-html-editor-image-dialog.c:489
 #: ../e-util/e-html-editor-table-dialog.c:869
-#, fuzzy
 msgid "Images"
-msgstr "Imaxe"
+msgstr "Imaxes"
 
 #: ../e-util/e-html-editor-cell-dialog.c:868
-#, fuzzy
 msgid "_Image:"
-msgstr "Imaxe"
+msgstr "_Imaxe:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:875
 #: ../e-util/e-html-editor-page-dialog.c:516
 #: ../e-util/e-html-editor-table-dialog.c:889
-#, fuzzy
 msgid "_Remove image"
-msgstr "_Sen imaxe"
+msgstr "_Quitar imaxe"
 
 #: ../e-util/e-html-editor-cell-dialog.c:895
-#, fuzzy
 msgid "Cell Properties"
-msgstr "_Propiedades"
+msgstr "Propiedades da cela"
 
 #: ../e-util/e-html-editor-find-dialog.c:105
 #: ../e-util/e-html-editor-replace-dialog.c:90
 #: ../e-util/e-html-editor-replace-dialog.c:108
 msgid "No match found"
-msgstr ""
+msgstr "Non se atopou unha coincidencia"
 
 #: ../e-util/e-html-editor-find-dialog.c:160
 #: ../e-util/e-html-editor-replace-dialog.c:229
-#, fuzzy
 msgid "Search _backwards"
-msgstr "_Base de busca:"
+msgstr "Buscar cara _atrás"
 
 #: ../e-util/e-html-editor-find-dialog.c:167
 msgid "Case _Sensitive"
-msgstr ""
+msgstr "_Distinguir entre maiúsculas e minúsculas"
 
 #: ../e-util/e-html-editor-find-dialog.c:174
-#, fuzzy
 msgid "_Wrap Search"
-msgstr "_Buscar"
+msgstr "_Axustar busca"
 
 #: ../e-util/e-html-editor-find-dialog.c:213
-#, fuzzy
 msgid "Find"
-msgstr "_Buscar"
+msgstr "Buscar"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:319
 msgid "<b>Size</b>"
-msgstr ""
+msgstr "<b>Tamaño</b>"
 
 #. Width
 #: ../e-util/e-html-editor-hrule-dialog.c:339
 #: ../e-util/e-html-editor-image-dialog.c:539
 #: ../e-util/e-html-editor-table-dialog.c:742
 msgid "_Width:"
-msgstr ""
+msgstr "_Ancho:"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:364
-#, fuzzy
 msgid "_Size:"
-msgstr "Tamaño"
+msgstr "_Tamaño:"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:371
 msgid "<b>Style</b>"
-msgstr ""
+msgstr "<b>Tamaño</b>"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:396
 #: ../e-util/e-html-editor-table-dialog.c:828
-#, fuzzy
 msgid "_Alignment:"
-msgstr "A_liñamento"
+msgstr "A_liñamento:"
 
 #. Shaded
 #: ../e-util/e-html-editor-hrule-dialog.c:402
 msgid "S_haded"
-msgstr ""
+msgstr "So_mbreado"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:419
-#, fuzzy
 msgid "Rule properties"
-msgstr "Propiedades do cartafol"
+msgstr "Propiedades da regra"
 
 #: ../e-util/e-html-editor-image-dialog.c:471
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
 #: ../e-util/e-html-editor-table-dialog.c:685
-#, fuzzy
 msgid "<b>General</b>"
-msgstr "Xeral"
+msgstr "<b>Xeral</b>"
 
 #: ../e-util/e-html-editor-image-dialog.c:500
-#, fuzzy
 msgid "_Source:"
-msgstr "Fonte"
+msgstr "_Fonte:"
 
 #: ../e-util/e-html-editor-image-dialog.c:563
 msgid "_Height:"
-msgstr ""
+msgstr "_Alto:"
 
 #: ../e-util/e-html-editor-image-dialog.c:604
 msgid "_X-Padding:"
-msgstr ""
+msgstr "Recheo-_X:"
 
 #: ../e-util/e-html-editor-image-dialog.c:620
 msgid "_Y-Padding:"
-msgstr ""
+msgstr "Recheo-_Y:"
 
 #: ../e-util/e-html-editor-image-dialog.c:636
 #: ../e-util/e-html-editor-table-dialog.c:809
 msgid "_Border:"
-msgstr ""
+msgstr "_Borde:"
 
 #: ../e-util/e-html-editor-image-dialog.c:646
 msgid "<b>Link</b>"
-msgstr ""
+msgstr "<b>Ligazón</b>"
 
 #: ../e-util/e-html-editor-image-dialog.c:664
 #: ../e-util/e-html-editor-link-dialog.c:334
@@ -12661,168 +12599,151 @@ msgstr "_URL:"
 #: ../e-util/e-html-editor-image-dialog.c:669
 #: ../e-util/e-html-editor-link-dialog.c:339
 msgid "_Test URL..."
-msgstr ""
+msgstr "_Probar URL…"
 
 #: ../e-util/e-html-editor-image-dialog.c:686
-#, fuzzy
 msgid "Image Properties"
-msgstr "Propiedades da categoría"
+msgstr "Propiedades da imaxe"
 
 #: ../e-util/e-html-editor-link-dialog.c:363
-#, fuzzy
 msgid "_Remove Link"
-msgstr "_Retirar"
+msgstr "_Retirar ligazón"
 
 #: ../e-util/e-html-editor-link-dialog.c:388
-#, fuzzy
 msgid "Link Properties"
-msgstr "_Propiedades"
+msgstr "Propiedades da ligazón"
 
 #: ../e-util/e-html-editor-page-dialog.c:69
 msgid "Perforated Paper"
-msgstr ""
+msgstr "Papel perforado"
 
 #: ../e-util/e-html-editor-page-dialog.c:78
 msgid "Blue Ink"
-msgstr ""
+msgstr "Tinta azul"
 
 #: ../e-util/e-html-editor-page-dialog.c:87
 msgid "Paper"
-msgstr ""
+msgstr "Papel"
 
 #: ../e-util/e-html-editor-page-dialog.c:96
 msgid "Ribbon"
-msgstr ""
+msgstr "Ribete"
 
 #: ../e-util/e-html-editor-page-dialog.c:105
 msgid "Midnight"
-msgstr ""
+msgstr "Medianoite"
 
-#: ../e-util/e-html-editor-page-dialog.c:123 ../mail/filtertypes.xml.in.h:35
-#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+#: ../e-util/e-html-editor-page-dialog.c:123 ../mail/filtertypes.xml.in.h:36
+#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
 msgid "Draft"
 msgstr "Borrador"
 
 #: ../e-util/e-html-editor-page-dialog.c:132
 msgid "Graph Paper"
-msgstr ""
+msgstr "Papel de gráficos"
 
 #: ../e-util/e-html-editor-page-dialog.c:415
 msgid "<b>Colors</b>"
-msgstr ""
+msgstr "<b>Cores</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:434
-#, fuzzy
 msgid "_Text:"
-msgstr "Só _texto"
+msgstr "_Texto:"
 
 #: ../e-util/e-html-editor-page-dialog.c:449
 msgid "_Link:"
-msgstr ""
+msgstr "_Ligazón:"
 
 #: ../e-util/e-html-editor-page-dialog.c:464
-#, fuzzy
 msgid "_Background:"
-msgstr "Estabelecer como _fondo"
+msgstr "_Fondo:"
 
 #: ../e-util/e-html-editor-page-dialog.c:472
 msgid "<b>Background Image</b>"
-msgstr ""
+msgstr "<b>Imaxe de fondo</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:494
-#, fuzzy
 msgid "_Template:"
-msgstr "Modelo:"
+msgstr "_Modelo:"
 
 #: ../e-util/e-html-editor-page-dialog.c:502
-#, fuzzy
-msgid "Selection a file"
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
 #: ../e-util/e-html-editor-page-dialog.c:509
-#, fuzzy
 msgid "_Custom:"
-msgstr "_Personalizar"
+msgstr "_Personalizar:"
 
 #: ../e-util/e-html-editor-page-dialog.c:536
-#, fuzzy
 msgid "Page Properties"
-msgstr "_Propiedades"
+msgstr "Propiedades da páxina"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:83
-#, fuzzy
 msgid "_Style:"
-msgstr "Estilo da _resposta:"
+msgstr "_Estilo:"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:90
-#, fuzzy
 msgid "<b>Alignment</b>"
-msgstr "A_liñamento"
+msgstr "<b>Aliñamento</b>"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:155
-#, fuzzy
 msgid "Paragraph Properties"
-msgstr "Propiedades da categoría"
+msgstr "Propiedades do parágrafo"
 
 #: ../e-util/e-html-editor-replace-dialog.c:148
-#, fuzzy, c-format
+#, c-format
 msgid "%d occurences replaced"
-msgstr "aparicións"
+msgstr "%d aparicións substituídas"
 
 #: ../e-util/e-html-editor-replace-dialog.c:209
-#, fuzzy
 msgid "R_eplace:"
-msgstr "S_ubstituír"
+msgstr "S_ubstituír:"
 
 #: ../e-util/e-html-editor-replace-dialog.c:221
-#, fuzzy
 msgid "_With:"
-msgstr "A_brir con"
+msgstr "_Con:"
 
 #: ../e-util/e-html-editor-replace-dialog.c:233
 msgid "_Case sensitive"
-msgstr ""
+msgstr "_Coincidir con maiúsculas e minúsculas"
 
 #: ../e-util/e-html-editor-replace-dialog.c:237
-#, fuzzy
 msgid "Wra_p search"
-msgstr "_Buscar"
+msgstr "_Axustar busca"
 
 #: ../e-util/e-html-editor-replace-dialog.c:247
 msgid "_Skip"
-msgstr ""
+msgstr "_Omitir"
 
 #: ../e-util/e-html-editor-replace-dialog.c:255
 #: ../e-util/e-system.error.xml.h:3
 msgid "_Replace"
-msgstr "S_ubstituír"
+msgstr "Subs_tituír"
 
 #: ../e-util/e-html-editor-replace-dialog.c:263
-#, fuzzy
 msgid "Replace _All"
-msgstr "Responder a t_odos"
+msgstr "Substituír _todos"
 
 #. Replace
 #: ../e-util/e-html-editor-replace-dialog.c:283
 #: ../e-util/e-html-editor-spell-check-dialog.c:536
-#, fuzzy
 msgid "Replace"
-msgstr "S_ubstituír"
+msgstr "Substituír"
 
 #: ../e-util/e-html-editor-spell-check-dialog.c:87
 #, c-format
 msgid "<b>Suggestions for '%s'</b>"
-msgstr ""
+msgstr "<b>Suxestións para '%s'</b>"
 
 #: ../e-util/e-html-editor-spell-check-dialog.c:501
 msgid "<b>Suggestions</b>"
-msgstr ""
+msgstr "<b>Suxestións</b>"
 
 #. Replace All
 #: ../e-util/e-html-editor-spell-check-dialog.c:545
-#, fuzzy
 msgid "Replace All"
-msgstr "S_ubstituír"
+msgstr "Substituír todo"
 
 #. Ignore
 #: ../e-util/e-html-editor-spell-check-dialog.c:554
@@ -12833,23 +12754,21 @@ msgstr "Ignorar"
 #. Skip
 #: ../e-util/e-html-editor-spell-check-dialog.c:563
 msgid "Skip"
-msgstr ""
+msgstr "Omitir"
 
 #. Back
 #: ../e-util/e-html-editor-spell-check-dialog.c:572
-#, fuzzy
 msgid "Back"
 msgstr "Atrás"
 
 #: ../e-util/e-html-editor-spell-check-dialog.c:581
 msgid "<b>Dictionary</b>"
-msgstr ""
+msgstr "<b>Dicionario</b>"
 
 #. Add Word button
 #: ../e-util/e-html-editor-spell-check-dialog.c:601
-#, fuzzy
 msgid "Add word"
-msgstr "Engadir un cartafol"
+msgstr "Engadir palabra"
 
 #: ../e-util/e-html-editor-spell-check-dialog.c:618
 #: ../mail/mail-config.ui.h:36
@@ -12858,72 +12777,64 @@ msgstr "Comprobación ortográfica"
 
 #: ../e-util/e-html-editor-table-dialog.c:707
 msgid "_Rows:"
-msgstr ""
+msgstr "_Filas:"
 
 #: ../e-util/e-html-editor-table-dialog.c:724
-#, fuzzy
 msgid "C_olumns:"
-msgstr "Columna da _táboa:"
+msgstr "C_olumna:"
 
 #: ../e-util/e-html-editor-table-dialog.c:775
 msgid "_Spacing:"
-msgstr ""
+msgstr "E_spaciado:"
 
 #: ../e-util/e-html-editor-table-dialog.c:792
-#, fuzzy
 msgid "_Padding:"
-msgstr "Cargando"
+msgstr "_Recheo:"
 
 #: ../e-util/e-html-editor-table-dialog.c:856
 #: ../e-util/e-html-editor-text-dialog.c:261
-#, fuzzy
 msgid "_Color:"
-msgstr "Cor:"
+msgstr "_Cor:"
 
 #: ../e-util/e-html-editor-table-dialog.c:882
-#, fuzzy
 msgid "Image:"
-msgstr "Imaxe"
+msgstr "Imaxe:"
 
 #: ../e-util/e-html-editor-table-dialog.c:909
-#, fuzzy
 msgid "Table Properties"
-msgstr "Propiedades do calendario"
+msgstr "Propiedades da táboa"
 
 #: ../e-util/e-html-editor-text-dialog.c:281
 msgid "Si_ze:"
-msgstr ""
+msgstr "Ta_maño:"
 
 #: ../e-util/e-html-editor-text-dialog.c:296
-#, fuzzy
 msgid "Text Properties"
-msgstr "_Propiedades"
+msgstr "Propiedades do texto"
 
-#: ../e-util/e-html-editor-view.c:3066
-#, fuzzy
+#: ../e-util/e-html-editor-view.c:3354
 msgid "Changed property"
-msgstr "Propiedades do calendario"
+msgstr "Propiedade cambiada"
 
-#: ../e-util/e-html-editor-view.c:3067
-#, fuzzy
+#: ../e-util/e-html-editor-view.c:3355
 msgid "Whether editor changed"
-msgstr "Indica se se debe emitir un pitido."
+msgstr "Indica se o editor cambiou"
 
-#: ../e-util/e-html-editor-view.c:6694
+#: ../e-util/e-html-editor-view.c:7130
 msgid ""
 "Turning HTML mode off will cause the text to lose all formatting. Do you "
 "want to continue?"
 msgstr ""
+"Desactivar o modo HTML causará que o texto perda todo o formatado. Desexa "
+"continuar?"
 
-#: ../e-util/e-html-editor-view.c:6698
-#, fuzzy
+#: ../e-util/e-html-editor-view.c:7134
 msgid "_Don't lose formatting"
-msgstr "Formatado de enderezos"
+msgstr "_Non perder o formatado"
 
-#: ../e-util/e-html-editor-view.c:6699
-#, fuzzy
+#: ../e-util/e-html-editor-view.c:7135
 msgid "_Lose formatting"
-msgstr "Formatado de enderezos"
+msgstr "_Perder formatado"
 
 #: ../e-util/e-import-assistant.c:256
 msgid ""
@@ -12933,10 +12844,6 @@ msgstr ""
 "Escolla o ficheiro que desexa importar ao Evolution e seleccione o tipo de "
 "ficheiro da lista."
 
-#: ../e-util/e-import-assistant.c:283
-msgid "Select a file"
-msgstr "Seleccionar un ficheiro"
-
 #: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
@@ -13042,27 +12949,27 @@ msgstr "Pechar"
 msgid "_Save and Close"
 msgstr "G_ardar e pechar"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:531
 msgid "Edit Signature"
 msgstr "Editar a sinatura"
 
-#: ../e-util/e-mail-signature-editor.c:562
+#: ../e-util/e-mail-signature-editor.c:564
 msgid "_Signature Name:"
 msgstr "Nome da _sinatura:"
 
-#: ../e-util/e-mail-signature-editor.c:598
+#: ../e-util/e-mail-signature-editor.c:600
 msgid "Unnamed"
 msgstr "Sen nome"
 
-#: ../e-util/e-mail-signature-manager.c:336
+#: ../e-util/e-mail-signature-manager.c:337
 msgid "Add _Script"
 msgstr "Engadir un _script"
 
-#: ../e-util/e-mail-signature-manager.c:425
+#: ../e-util/e-mail-signature-manager.c:426
 msgid "Add Signature Script"
 msgstr "Engadir un script de sinatura"
 
-#: ../e-util/e-mail-signature-manager.c:496
+#: ../e-util/e-mail-signature-manager.c:497
 msgid "Edit Signature Script"
 msgstr "Editar o script de sinatura"
 
@@ -13078,7 +12985,7 @@ msgstr ""
 
 #: ../e-util/e-mail-signature-script-dialog.c:415
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:309
+#: ../mail/e-mail-config-identity-page.c:327
 #: ../mail/e-mail-config-summary-page.c:339
 msgid "_Name:"
 msgstr "_Nome:"
@@ -13112,25 +13019,25 @@ msgstr "Non foi posíbel abrir a ligazón."
 msgid "Could not display help for Evolution."
 msgstr "Non foi posíbel mostrar a axuda do Evolution."
 
-#: ../e-util/e-misc-utils.c:2390
+#: ../e-util/e-misc-utils.c:2348
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Abrindo o calendario «%s»"
 
-#: ../e-util/e-misc-utils.c:2393
+#: ../e-util/e-misc-utils.c:2351
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Abrindo a lista de notas «%s»"
 
-#: ../e-util/e-misc-utils.c:2396
+#: ../e-util/e-misc-utils.c:2354
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Abrindo as tarefas «%s»"
 
-#: ../e-util/e-misc-utils.c:2399
-#, fuzzy, c-format
+#: ../e-util/e-misc-utils.c:2357
+#, c-format
 msgid "Opening address book '%s'"
-msgstr "Abrindo o almacenamento «%s»"
+msgstr "Abrindo a axenda de enderezos «%s»"
 
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
@@ -13150,7 +13057,7 @@ 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:1215
+#: ../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
@@ -13172,7 +13079,7 @@ msgstr "Axenda de enderezos"
 
 #: ../e-util/e-name-selector-dialog.c:451
 #: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:373
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -13181,25 +13088,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Seleccionar contactos desde a axenda de enderezos"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3065
+#: ../e-util/e-name-selector-entry.c:3183
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "E_xpandir %s en liña"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3081
+#: ../e-util/e-name-selector-entry.c:3199
 #, c-format
 msgid "Cop_y %s"
 msgstr "Cop_iar %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3092
+#: ../e-util/e-name-selector-entry.c:3210
 #, c-format
 msgid "C_ut %s"
 msgstr "Co_rtar %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3110
+#: ../e-util/e-name-selector-entry.c:3228
 #, c-format
 msgid "_Edit %s"
 msgstr "_Editar %s"
@@ -13226,29 +13133,29 @@ msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "O Evolution está actualmente sen conexión porque a rede non está dispoñíbel."
 
-#: ../e-util/e-passwords.c:125
+#: ../e-util/e-passwords.c:127
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 "A chave do anel de chaves non é utilizábel: non existe o usuario ou nome do "
 "host"
 
-#: ../e-util/e-passwords.c:445
+#: ../e-util/e-passwords.c:447
 msgid "You have the Caps Lock key on."
 msgstr "A tecla Bloq Maiús está activada."
 
-#: ../e-util/e-passwords.c:576
+#: ../e-util/e-passwords.c:578
 msgid "_Remember this passphrase"
 msgstr "_Lembrar esta frase de paso"
 
-#: ../e-util/e-passwords.c:577
+#: ../e-util/e-passwords.c:579
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Lembrar esta frase de paso durante a sesión"
 
-#: ../e-util/e-passwords.c:582
+#: ../e-util/e-passwords.c:584
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: ../e-util/e-passwords.c:583
+#: ../e-util/e-passwords.c:585
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Lembrar este contrasinal para o recordatorio durante a sesión"
 
@@ -13402,7 +13309,8 @@ msgstr "Alcanzouse o inicio da páxina, continúase desde o final"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
 #: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1097
+#: ../modules/mail/e-mail-shell-view.c:1163
+#: ../smime/gui/certificate-manager.c:1669
 msgid "Mail"
 msgstr "Correo"
 
@@ -13581,40 +13489,40 @@ msgstr "Seleccionar destino"
 
 #. Translators: %s is the language ISO code.
 #: ../e-util/e-spell-dictionary.c:266
-#, fuzzy, c-format
+#, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
-msgstr "Descoñecido"
+msgstr "Descoñecido (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
 #: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
-#, fuzzy, c-format
+#, c-format
 msgctxt "language"
 msgid "%s (%s)"
-msgstr "%s (%u%s)"
+msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:384
+#: ../e-util/e-spell-entry.c:379
 msgid "(no suggestions)"
 msgstr "(non hai suxestións)"
 
-#: ../e-util/e-spell-entry.c:408
+#: ../e-util/e-spell-entry.c:403
 msgid "More..."
 msgstr "Máis…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:493
+#: ../e-util/e-spell-entry.c:488
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Engadir \"%s\" ao Dicionario"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:542
+#: ../e-util/e-spell-entry.c:537
 msgid "Ignore All"
 msgstr "Ignorar todo"
 
-#: ../e-util/e-spell-entry.c:574
+#: ../e-util/e-spell-entry.c:569
 msgid "Spelling Suggestions"
 msgstr "Suxestións de ortografía"
 
@@ -13781,7 +13689,7 @@ msgid "Choose the order of information to appear in the message list."
 msgstr "Seleccione a orde da información que aparece na lista de mensaxes."
 
 #: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:281
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:367
 #: ../modules/cal-config-google/e-google-chooser-dialog.c:191
 msgid "_Apply"
 msgstr "_Aplicar"
@@ -13974,21 +13882,21 @@ msgstr "Prema aquí para abrir o URL"
 msgid "Enter a URL here"
 msgstr "Escriba unha URL aquí"
 
-#: ../e-util/evolution-source-viewer.c:636
+#: ../e-util/evolution-source-viewer.c:637
 msgid "Evolution Source Viewer"
 msgstr "Visor de fontes de Evolution"
 
 #. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:666
+#: ../e-util/evolution-source-viewer.c:667
 msgid "Display Name"
 msgstr "Nome en pantalla"
 
-#: ../e-util/evolution-source-viewer.c:675
+#: ../e-util/evolution-source-viewer.c:676
 msgid "Flags"
 msgstr "Bandeiras"
 
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:676
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:722
 msgid "Identity"
 msgstr "Identidade"
 
@@ -14028,43 +13936,42 @@ msgstr "Gardar _imaxe…"
 msgid "Save the image to a file"
 msgstr "Gardar a imaxe a un ficheiro"
 
-#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1337
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1338
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto e as imaxes"
 
-#: ../e-util/e-web-view.c:1001
+#: ../e-util/e-web-view.c:1002
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar a %s"
 
-#: ../e-util/e-web-view.c:1003
+#: ../e-util/e-web-view.c:1004
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar/mostrar os enderezos"
 
-#: ../e-util/e-web-view.c:1014
-#, fuzzy, c-format
+#: ../e-util/e-web-view.c:1015
+#, c-format
 msgid "Go to the section %s of the message"
-msgstr "Introducir os destinatarios da mensaxe"
+msgstr "Ir á sección %s do mensaxe"
 
-#: ../e-util/e-web-view.c:1016
-#, fuzzy
+#: ../e-util/e-web-view.c:1017
 msgid "Go to the beginning of the message"
-msgstr "Introducir os destinatarios da mensaxe"
+msgstr "Ir ao inicio da mensaxe"
 
-#: ../e-util/e-web-view.c:1020
+#: ../e-util/e-web-view.c:1021
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
 
-#: ../e-util/e-web-view.c:2853
+#: ../e-util/e-web-view.c:2854
 msgid "Copying image to clipboard"
 msgstr "Copiar imaxe ao portapapeis"
 
-#: ../e-util/e-web-view.c:3041
+#: ../e-util/e-web-view.c:3042
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#: ../e-util/e-web-view.c:3077
+#: ../e-util/e-web-view.c:3078
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Gardando imaxe en «%s»"
@@ -14227,8 +14134,13 @@ msgstr "Cela da táboa"
 msgid "popup a child"
 msgstr "mostrar un fillo"
 
+#. Translators: description of an "edit" action
+#: ../e-util/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "comezar a usar esta cela"
+
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:179
+#: ../e-util/gal-a11y-e-cell-toggle.c:177
 msgid "toggle the cell"
 msgstr "alternar a cela"
 
@@ -14329,11 +14241,6 @@ msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr ""
 "Esta opción usará un token de acceso OAuth 2.0 para conectarse ao servidor"
 
-#: ../libemail-engine/e-mail-authenticator.c:181
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "Código de resposta (%d) de autenticación non válido"
-
 #: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
 msgid "Saving message to folder '%s'"
@@ -14385,56 +14292,46 @@ msgstr[1] "Gardando %d mensaxes"
 msgid "Invalid folder URI '%s'"
 msgstr "O URI do cartafol «%s» non é válido"
 
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410
 #: ../mail/em-folder-tree-model.c:1174
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1167
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Drafts"
 msgstr "Borradores"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1178
-#: ../modules/mail/e-mail-shell-view-private.c:1068
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
+#: ../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Outbox"
 msgstr "Caixa de saída"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1182
-#: ../modules/mail/e-mail-shell-view-private.c:1070
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Sent"
 msgstr "Enviados"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1170
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432
 #: ../plugins/templates/templates.c:1442
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../libemail-engine/e-mail-session.c:1245
+#: ../libemail-engine/e-mail-session.c:1261
 #, c-format
 msgid "User cancelled operation"
 msgstr "O usuario cancelou a operación"
 
-#: ../libemail-engine/e-mail-session.c:1373
-#, c-format
-msgid "%s authentication failed"
-msgstr "A autenticación %s fallou"
-
-#: ../libemail-engine/e-mail-session.c:1423
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr "Non foi posíbel atopar os datos para o UID «%s»"
-
-#: ../libemail-engine/e-mail-session.c:1486
+#: ../libemail-engine/e-mail-session.c:1318
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -14442,24 +14339,42 @@ msgid ""
 msgstr ""
 "Non se forneceu ningún enderezo de destino, cancelouse o reenvío do mensaxe."
 
-#: ../libemail-engine/e-mail-session.c:1499
+#: ../libemail-engine/e-mail-session.c:1331
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 "Non se atopou ningunha identidade que usar, cancelouse o reenvío do mensaxe."
 
+#: ../libemail-engine/e-mail-session.c:2343
+#, c-format
+msgid "Waiting for '%s'"
+msgstr "Agardando por «%s»"
+
 #: ../libemail-engine/e-mail-session-utils.c:539
 msgid "No mail transport service available"
 msgstr "Non hai un servizo de transporte de correo dispoñíbel"
 
-#: ../libemail-engine/e-mail-session-utils.c:659
-#: ../libemail-engine/mail-ops.c:730
+#: ../libemail-engine/e-mail-session-utils.c:629
+#: ../libemail-engine/mail-ops.c:718
+#, c-format
+msgid "Posting message to '%s'"
+msgstr "Enviando un mensaxe a «%s»"
+
+#: ../libemail-engine/e-mail-session-utils.c:666
+#: ../libemail-engine/mail-ops.c:754
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Produciuse un erro ao aplicar os filtros ao correo saínte: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:708
-#: ../libemail-engine/mail-ops.c:773
+#: ../libemail-engine/e-mail-session-utils.c:696
+#: ../libemail-engine/e-mail-session-utils.c:731
+#: ../libemail-engine/mail-ops.c:778 ../libemail-engine/mail-ops.c:813
+#, c-format
+msgid "Storing sent message to '%s'"
+msgstr "Almacenando o mensaxe enviado a «%s»"
+
+#: ../libemail-engine/e-mail-session-utils.c:720
+#: ../libemail-engine/mail-ops.c:802
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14468,14 +14383,14 @@ msgstr ""
 "Produciuse un erro ao anexar a %s: %s\n"
 "No seu lugar anexaranse ao cartafol local «Enviados»."
 
-#: ../libemail-engine/e-mail-session-utils.c:734
-#: ../libemail-engine/mail-ops.c:797
+#: ../libemail-engine/e-mail-session-utils.c:750
+#: ../libemail-engine/mail-ops.c:830
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Produciuse un erro ao anexar ao cartafol local «Enviados»: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:935
-#: ../libemail-engine/mail-ops.c:942 ../libemail-engine/mail-ops.c:1044
+#: ../libemail-engine/e-mail-session-utils.c:952
+#: ../libemail-engine/mail-ops.c:978 ../libemail-engine/mail-ops.c:1080
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
@@ -14516,7 +14431,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Obtendo o correo de «%s»"
 
-#: ../libemail-engine/mail-ops.c:724
+#: ../libemail-engine/mail-ops.c:748
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -14529,56 +14444,61 @@ msgstr ""
 "Comprobe os seus filtros en Editar->Filtros de mensaxes.\n"
 "O erro orixinal foi: %s"
 
-#: ../libemail-engine/mail-ops.c:953
+#: ../libemail-engine/mail-ops.c:989
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../libemail-engine/mail-ops.c:1005
+#: ../libemail-engine/mail-ops.c:1041
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Produciuse un erro ao enviar unha mensaxe"
 msgstr[1] "Produciuse un erro ao enviar %d de %d mensaxes"
 
-#: ../libemail-engine/mail-ops.c:1011
+#: ../libemail-engine/mail-ops.c:1047
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../libemail-engine/mail-ops.c:1013
+#: ../libemail-engine/mail-ops.c:1049
 msgid "Complete."
 msgstr "Completado."
 
-#: ../libemail-engine/mail-ops.c:1125
+#: ../libemail-engine/mail-ops.c:1163
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a «%s»"
 
-#: ../libemail-engine/mail-ops.c:1126
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a «%s»"
 
-#: ../libemail-engine/mail-ops.c:1245
+#: ../libemail-engine/mail-ops.c:1283
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gardando o cartafol «%s»"
 
-#: ../libemail-engine/mail-ops.c:1373
+#: ../libemail-engine/mail-ops.c:1411
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expurgando e gardando a conta «%s»"
 
-#: ../libemail-engine/mail-ops.c:1374
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Gardando a conta «%s»"
 
-#: ../libemail-engine/mail-ops.c:1449
+#: ../libemail-engine/mail-ops.c:1487
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo de «%s»"
 
+#: ../libemail-engine/mail-ops.c:1579
+#, c-format
+msgid "Processing folder changes in '%s'"
+msgstr "Procesando os cambios do cartafol en «%s»"
+
 #: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
@@ -14652,7 +14572,7 @@ msgid "De_fault"
 msgstr "Prede_finido"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1173
+#: ../modules/mail/em-composer-prefs.c:1228
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
 #: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
@@ -14674,8 +14594,8 @@ msgstr "Falta o dominio no enderezo de correo"
 msgid "Unknown background operation"
 msgstr "Operación en segundo plano descoñecida"
 
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
-#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
+#: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
@@ -14689,15 +14609,15 @@ msgid "Go _Back"
 msgstr "_Atrás"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:114
+#: ../mail/e-mail-config-assistant.c:115
 msgid "_Skip Lookup"
 msgstr "_Omitir busca"
 
-#: ../mail/e-mail-config-assistant.c:653
+#: ../mail/e-mail-config-assistant.c:660
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
-#: ../mail/e-mail-config-assistant.c:935
+#: ../mail/e-mail-config-assistant.c:952
 msgid "_Revise Details"
 msgstr "_Revisar detalles"
 
@@ -14724,87 +14644,96 @@ msgstr ""
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/e-mail-config-defaults-page.c:548
+#: ../mail/e-mail-config-defaults-page.c:549
 msgid "Special Folders"
 msgstr "Cartafoles especiais"
 
-#: ../mail/e-mail-config-defaults-page.c:557
+#: ../mail/e-mail-config-defaults-page.c:558
 msgid "Draft Messages _Folder:"
 msgstr "Cartafol das _mensaxes enviadas:"
 
-#: ../mail/e-mail-config-defaults-page.c:567
+#: ../mail/e-mail-config-defaults-page.c:568
 msgid "Choose a folder for saving draft messages."
 msgstr "Seleccione un cartafol no que gardar os borradores."
 
-#: ../mail/e-mail-config-defaults-page.c:581
+#: ../mail/e-mail-config-defaults-page.c:582
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol das _mensaxes enviadas:"
 
-#: ../mail/e-mail-config-defaults-page.c:591
+#: ../mail/e-mail-config-defaults-page.c:592
 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:610
+#: ../mail/e-mail-config-defaults-page.c:611
 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:627
+#: ../mail/e-mail-config-defaults-page.c:628
+msgid "Archi_ve Folder:"
+msgstr "Cartafol Arqui_vo:"
+
+#: ../mail/e-mail-config-defaults-page.c:638
+#: ../modules/mail/em-mailer-prefs.c:1079
+msgid "Choose a folder to archive messages to."
+msgstr "Escolla un cartafol onde arquivar mensaxes."
+
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "_Restore Defaults"
 msgstr "_Restaurar valores predeterminados"
 
-#: ../mail/e-mail-config-defaults-page.c:641
+#: ../mail/e-mail-config-defaults-page.c:666
 msgid "Use a Real Folder for _Trash:"
 msgstr "Usar un cartafol real para o _Lixo:"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:667
 msgid "Choose a folder for deleted messages."
 msgstr "Seleccione un cartafol no que gardar as mensaxes eliminadas."
 
-#: ../mail/e-mail-config-defaults-page.c:651
+#: ../mail/e-mail-config-defaults-page.c:676
 msgid "Use a Real Folder for _Junk:"
 msgstr "Usar un cartafol real para o _lixo:"
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:677
 msgid "Choose a folder for junk messages."
 msgstr "Seleccione un cartafol para o spam."
 
-#: ../mail/e-mail-config-defaults-page.c:669
+#: ../mail/e-mail-config-defaults-page.c:694
 msgid "Composing Messages"
 msgstr "Escribir unha mensaxe"
 
-#: ../mail/e-mail-config-defaults-page.c:678
+#: ../mail/e-mail-config-defaults-page.c:703
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar _sempre unha copia de carbón (Cc) a:"
 
-#: ../mail/e-mail-config-defaults-page.c:703
+#: ../mail/e-mail-config-defaults-page.c:728
 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:738
+#: ../mail/e-mail-config-defaults-page.c:763
 msgid "Message Receipts"
 msgstr "Confirmacións de lectura das mensaxes"
 
-#: ../mail/e-mail-config-defaults-page.c:747
+#: ../mail/e-mail-config-defaults-page.c:772
 msgid "S_end message receipts:"
 msgstr "_Enviar as confirmacións de lectura das mensaxes:"
 
-#: ../mail/e-mail-config-defaults-page.c:772
+#: ../mail/e-mail-config-defaults-page.c:797
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/e-mail-config-defaults-page.c:778
+#: ../mail/e-mail-config-defaults-page.c:803
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/e-mail-config-defaults-page.c:784
+#: ../mail/e-mail-config-defaults-page.c:809
 msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
-#: ../mail/e-mail-config-defaults-page.c:855
+#: ../mail/e-mail-config-defaults-page.c:880
 msgid "Defaults"
 msgstr "Predefinicións"
 
-#: ../mail/e-mail-config-identity-page.c:264
+#: ../mail/e-mail-config-identity-page.c:282
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14814,12 +14743,12 @@ 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:292
+#: ../mail/e-mail-config-identity-page.c:310
 #: ../mail/e-mail-config-summary-page.c:322
 msgid "Account Information"
 msgstr "Información da conta"
 
-#: ../mail/e-mail-config-identity-page.c:301
+#: ../mail/e-mail-config-identity-page.c:319
 #: ../mail/e-mail-config-summary-page.c:331
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14828,35 +14757,41 @@ msgstr ""
 "Escriba o nome polo que quere identificar esta conta.\n"
 "Por exemplo: «Traballo» ou «Persoal»"
 
-#: ../mail/e-mail-config-identity-page.c:346
+#: ../mail/e-mail-config-identity-page.c:364
 msgid "Required Information"
 msgstr "Información solicitada"
 
-#: ../mail/e-mail-config-identity-page.c:355
+#: ../mail/e-mail-config-identity-page.c:373
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/e-mail-config-identity-page.c:382
+#: ../mail/e-mail-config-identity-page.c:400
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../mail/e-mail-config-identity-page.c:429
+#: ../mail/e-mail-config-identity-page.c:447
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Información opcional"
 
-#: ../mail/e-mail-config-identity-page.c:438
+#: ../mail/e-mail-config-identity-page.c:456
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/e-mail-config-identity-page.c:465
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: ../mail/e-mail-config-identity-page.c:520
+#: ../mail/e-mail-config-identity-page.c:538
 msgid "Add Ne_w Signature..."
 msgstr "Engadir unha sinatura _nova…"
 
+#: ../mail/e-mail-config-identity-page.c:556
+msgid "Try _setup account automatically, based on Email Address"
+msgstr ""
+"Tentar a _configuración da conta automaticamente, baseado no enderezo de "
+"correo"
+
 #: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Buscando polos detalles da conta..."
@@ -14888,7 +14823,7 @@ msgstr "%s - %s"
 #: ../mail/e-mail-config-security-page.c:340
 #: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:28
 #: ../modules/addressbook/autocompletion-config.c:114
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
@@ -14958,7 +14893,7 @@ msgstr "Seleccionar"
 
 #: ../mail/e-mail-config-security-page.c:544
 #: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:1007
+#: ../shell/e-shell-window-actions.c:1006
 msgid "_Clear"
 msgstr "Limpa_r"
 
@@ -15051,7 +14986,7 @@ msgstr "Resumo da conta"
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 msgstr ""
 "Dámoslle a benvida ao Asistente de Configuración de Correo do Evolution.\n"
 "\n"
@@ -15106,6 +15041,48 @@ msgstr "C_rear"
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
+#. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
+#. The translated value should not contain spaces.
+#: ../mail/e-mail-free-form-exp.c:226
+msgctxt "ffe"
+msgid "Answered"
+msgstr "Respondida"
+
+#: ../mail/e-mail-free-form-exp.c:227
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "Eliminada"
+
+#: ../mail/e-mail-free-form-exp.c:228
+msgctxt "ffe"
+msgid "Draft"
+msgstr "Borrador"
+
+#: ../mail/e-mail-free-form-exp.c:229
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "Marcada"
+
+#: ../mail/e-mail-free-form-exp.c:230
+msgctxt "ffe"
+msgid "Seen"
+msgstr "Visto"
+
+#: ../mail/e-mail-free-form-exp.c:231
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "Anexo"
+
+#: ../mail/e-mail-free-form-exp.c:479
+msgctxt "ffe"
+msgid "no"
+msgstr "non"
+
+#: ../mail/e-mail-free-form-exp.c:480
+msgctxt "ffe"
+msgid "false"
+msgstr "falso"
+
 #: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "Software de filtrado de SPAM:"
@@ -15114,32 +15091,32 @@ msgstr "Software de filtrado de SPAM:"
 msgid "_Label name:"
 msgstr "_Nome da etiqueta:"
 
-#: ../mail/e-mail-label-list-store.c:56
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "I_mportante"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "_Traballo"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "_Persoal"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "_Tarefas pendentes"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "_Máis tarde"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#: ../modules/mail/e-mail-shell-view-actions.c:1078
 msgid "Add Label"
 msgstr "Engadir unha etiqueta"
 
@@ -15187,7 +15164,7 @@ msgstr "Nome da cabeceira:"
 msgid "Header Value"
 msgstr "Valor da cabecera"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:110
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:113
 msgid "Headers"
 msgstr "Cabeceiras"
 
@@ -15197,580 +15174,620 @@ msgid "Page %d of %d"
 msgstr "Páxina %d de %d"
 
 #: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
+msgid "Move to Folder"
+msgstr "Mover ao cartafol"
+
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
 #: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
-msgid "C_opy"
-msgstr "C_opiar"
-
-#: ../mail/e-mail-reader.c:848 ../mail/filtertypes.xml.in.h:62
-msgid "Move to Folder"
-msgstr "Mover ao cartafol"
-
-#: ../mail/e-mail-reader.c:852 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:1173 ../mail/e-mail-reader.c:1385
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "C_opiar"
+
+#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480
+#: ../mail/e-mail-reader.c:1520
 msgid "_Do not ask me again."
 msgstr "_Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:1431
+#: ../mail/e-mail-reader.c:1526
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar sempre «Responder a:» para as listas de correo."
 
-#: ../mail/e-mail-reader.c:1633
+#: ../mail/e-mail-reader.c:1728
 msgid "Failed to retrieve message:"
 msgstr "Produciuse un erro ao obter a mensaxe:"
 
-#: ../mail/e-mail-reader.c:1678 ../mail/e-mail-reader.c:2855
+#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3013
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando a mensaxe «%s»"
 
-#: ../mail/e-mail-reader.c:1866
+#: ../mail/e-mail-reader.c:1961
 msgid "A_dd Sender to Address Book"
 msgstr "Enga_dir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1868
+#: ../mail/e-mail-reader.c:1963
 msgid "Add sender to address book"
 msgstr "Engadir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1873
+#: ../mail/e-mail-reader.c:1968
+msgid "_Archive..."
+msgstr "_Arquivo…"
+
+#: ../mail/e-mail-reader.c:1970
+msgid "Move selected messages to the Archive folder for the account"
+msgstr "Mover os mensaxes seleccionados ao cartafol Arquivo para a conta"
+
+#: ../mail/e-mail-reader.c:1975
 msgid "Check for _Junk"
 msgstr "Comprobar se hai correo li_xo"
 
-#: ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:1977
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo lixo"
 
-#: ../mail/e-mail-reader.c:1880
+#: ../mail/e-mail-reader.c:1982
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafol…"
 
-#: ../mail/e-mail-reader.c:1882
+#: ../mail/e-mail-reader.c:1984
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1887
+#: ../mail/e-mail-reader.c:1989
 msgid "_Delete Message"
 msgstr "E_liminar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:1991
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1996
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Crear unha regra de filtrado segundo a _rolda de correo…"
 
-#: ../mail/e-mail-reader.c:1896
+#: ../mail/e-mail-reader.c:1998
 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:1901
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Crear unha regra de filtrado segundo os _destinatarios…"
 
-#: ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:2005
 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:1908
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Crear unha regra de filtrado segundo o re_mitente…"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:2012
 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:1915
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Crear unha regra de filtrado segundo o _asunto…"
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:2019
 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:1922
+#: ../mail/e-mail-reader.c:2024
 msgid "A_pply Filters"
 msgstr "_Aplicar os filtros"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:2026
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtrado ás mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:2031
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxe…"
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:2033
 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:1936
+#: ../mail/e-mail-reader.c:2038
 msgid "_Clear Flag"
 msgstr "E_liminar a marca"
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:2040
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Retirar as marcas de seguimento das mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:2045
 msgid "_Flag Completed"
 msgstr "_Marcar como completado"
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:2047
 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:1950
+#: ../mail/e-mail-reader.c:2052
 msgid "Follow _Up..."
 msgstr "Seguimento…"
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:2054
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:2059
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:1959 ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reencamiñar a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:2066
 msgid "Forward As _Attached"
 msgstr "Reencamiñar como un _anexo"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:2073
 msgid "_Inline"
 msgstr "_Inserida"
 
-#: ../mail/e-mail-reader.c:1973 ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
 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:1978
+#: ../mail/e-mail-reader.c:2080
 msgid "Forward As _Inline"
 msgstr "Reencamiñar _inserida"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:2087
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:1987 ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reencamiñar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2094
 msgid "Forward As _Quoted"
 msgstr "Reencamiñar _citada"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2101
 msgid "_Load Images"
 msgstr "_Cargar as imaxes"
 
-#: ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2103
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+msgid "_Ignore Subthread"
+msgstr "_Ignorar subfío"
+
+#: ../mail/e-mail-reader.c:2110
+msgid "Mark new mails in a subthread as read automatically"
+msgstr "Marcar novos correos na subconversa como lida automaticamente"
+
+#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+msgid "_Ignore Thread"
+msgstr "_Ignorar fío"
+
+#: ../mail/e-mail-reader.c:2117
+msgid "Mark new mails in this thread as read automatically"
+msgstr "Marcar os novos correos nesta conversa como lidas automaticamente"
+
+#: ../mail/e-mail-reader.c:2122
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:2008
+#: ../mail/e-mail-reader.c:2124
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2129
 msgid "_Junk"
 msgstr "_Correo lixo"
 
-#: ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2131
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo lixo"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2136
 msgid "_Not Junk"
 msgstr "_Non é correo lixo"
 
-#: ../mail/e-mail-reader.c:2022
+#: ../mail/e-mail-reader.c:2138
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2143
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2145
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+msgid "Do not _Ignore Subthread"
+msgstr "Non _ignorar sub-conversa"
+
+#: ../mail/e-mail-reader.c:2152
+msgid "Do not mark new mails in a subthread as read automatically"
+msgstr "Non marcar novos correos nunha subconversa como lidos automaticamente"
+
+#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+msgid "Do not _Ignore Thread"
+msgstr "Non _ignorar conversa"
+
+#: ../mail/e-mail-reader.c:2159
+msgid "Do not mark new mails in this thread as read automatically"
+msgstr "Non marcar novos correos nesta conversa como lidos automaticamente"
+
+#: ../mail/e-mail-reader.c:2164
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2166
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2171
 msgid "_Unread"
 msgstr "_Sen ler"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2173
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2178
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe nova…"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2180
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2185
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2187
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para escribir unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2192
 msgid "_Open in New Window"
 msgstr "Abrir nunha xanela n_ova"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2194
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2199
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafol…"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2201
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:2076
+#: ../mail/e-mail-reader.c:2206
 msgid "_Next Message"
 msgstr "Segui_nte mensaxe"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2208
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:2213
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2215
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2090
+#: ../mail/e-mail-reader.c:2220
 msgid "Next _Thread"
 msgstr "Seguin_te fío"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2222
 msgid "Display the next thread"
 msgstr "Mostrar o seguinte fío"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2227
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _sen ler"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2229
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2234
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2236
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2241
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2243
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2248
 msgid "Previous T_hread"
 msgstr "_Conversa anterior"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2250
 msgid "Display the previous thread"
 msgstr "Mostrar o fío anterior"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2255
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe sen ler"
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2257
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2264
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:2141
+#: ../mail/e-mail-reader.c:2271
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2276
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2278
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguén a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2283
 msgid "Remo_ve Attachments"
 msgstr "Eliminar os _anexos"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2285
 msgid "Remove attachments"
 msgstr "Retirar os anexos"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2290
 msgid "Remove Du_plicate Messages"
 msgstr "Retirar as mensaxes du_plicadas"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2292
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar se hai mensaxes seleccionadas que estean duplicadas"
 
-#: ../mail/e-mail-reader.c:2167 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2299
 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:2174 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Responder á _lista"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2306
 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:2181
+#: ../mail/e-mail-reader.c:2311
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2313
 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:2188
+#: ../mail/e-mail-reader.c:2318
 msgid "_Save as mbox..."
 msgstr "Gardar como mbox…"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2320
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes seleccionadas como un ficheiro mbox"
 
-#: ../mail/e-mail-reader.c:2195
+#: ../mail/e-mail-reader.c:2325
 msgid "_Message Source"
 msgstr "Fonte da _mensaxe"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2327
 msgid "Show the raw email source of the message"
 msgstr "Mostrar a fonte en bruto da mensaxe"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2339
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2341
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2346
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2348
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaño orixinal"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2353
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2355
 msgid "Increase the text size"
 msgstr "Aumentar o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:2232
+#: ../mail/e-mail-reader.c:2362
 msgid "Decrease the text size"
 msgstr "Diminuír o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:2239
+#: ../mail/e-mail-reader.c:2369
 msgid "Cre_ate"
 msgstr "Cre_ar"
 
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2376
 msgid "Ch_aracter Encoding"
 msgstr "Codificación de car_acteres"
 
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2383
 msgid "F_orward As"
 msgstr "Reencamiñar c_omo…"
 
-#: ../mail/e-mail-reader.c:2260
+#: ../mail/e-mail-reader.c:2390
 msgid "_Group Reply"
 msgstr "_Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:2267
+#: ../mail/e-mail-reader.c:2397
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:2274
+#: ../mail/e-mail-reader.c:2404
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2411
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:2288
+#: ../mail/e-mail-reader.c:2418
 msgid "_Zoom"
 msgstr "A_mpliar"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2428
 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:2300
+#: ../mail/e-mail-reader.c:2430
 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:2305
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Crear un cartafol de busca segundo os des_tinatarios…"
 
-#: ../mail/e-mail-reader.c:2307
+#: ../mail/e-mail-reader.c:2437
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Crear un cartafol de busca segundo o _remitente…"
 
-#: ../mail/e-mail-reader.c:2314
+#: ../mail/e-mail-reader.c:2444
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Crear un cartafol de busca segundo o as_unto…"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2451
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:2344
+#: ../mail/e-mail-reader.c:2478
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimento…"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2494
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2498
 msgid "Mark as _Junk"
 msgstr "Marcar como correo l_ixo"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2502
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo lixo"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2506
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2518
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:2372
+#: ../mail/e-mail-reader.c:2522
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:2416
+#: ../mail/e-mail-reader.c:2566
 msgid "_Caret Mode"
 msgstr "Activar o _cursor"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2568
 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:2424
+#: ../mail/e-mail-reader.c:2574
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:2426
+#: ../mail/e-mail-reader.c:2576
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrónico"
 
-#: ../mail/e-mail-reader.c:2861
+#: ../mail/e-mail-reader.c:3019
 msgid "Retrieving message"
 msgstr "Descargando mensaxe"
 
-#: ../mail/e-mail-reader.c:3826
+#: ../mail/e-mail-reader.c:4027
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Reencamiñar"
 
-#: ../mail/e-mail-reader.c:3827
+#: ../mail/e-mail-reader.c:4028
 msgid "Forward the selected message to someone"
 msgstr "Reencamiñar a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:3846
+#: ../mail/e-mail-reader.c:4047
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:3847
+#: ../mail/e-mail-reader.c:4048
 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:3913 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:4114 ../mail/filtertypes.xml.in.h:65
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:3925
+#: ../mail/e-mail-reader.c:4126
 #: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:3929
+#: ../mail/e-mail-reader.c:4130
 #: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3938 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4139 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Responder"
 
@@ -15778,18 +15795,36 @@ msgstr "Responder"
 msgid "Do not warn me again"
 msgstr "Non avisarme de novo."
 
-#: ../mail/e-mail-reader-utils.c:556 ../plugins/face/face.c:170
-#: ../smime/gui/certificate-manager.c:341
+#: ../mail/e-mail-reader-utils.c:556
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1800
+#: ../plugins/face/face.c:170 ../shell/e-shell.c:856 ../shell/e-shell.c:877
+#: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../mail/e-mail-reader-utils.c:973
+#: ../mail/e-mail-reader-utils.c:1033
+msgid "Marking thread to be ignored"
+msgstr "Marcar conversa para ignorala"
+
+#: ../mail/e-mail-reader-utils.c:1037
+msgid "Unmarking thread from being ignored"
+msgstr "Desmarcando conversa para ignorala"
+
+#: ../mail/e-mail-reader-utils.c:1041
+msgid "Marking subthread to be ignored"
+msgstr "Marcando sub-conversa para ignorala"
+
+#: ../mail/e-mail-reader-utils.c:1045
+msgid "Unmarking subthread from being ignored"
+msgstr "Desmarcando sub-conversa para ignorala"
+
+#: ../mail/e-mail-reader-utils.c:1280
 msgid "Printing"
 msgstr "Imprimindo"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1208
+#: ../mail/e-mail-reader-utils.c:1515
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -15804,7 +15839,7 @@ msgstr[1] ""
 "O cartafol «%s» contén %u mensaxes duplicadas. Ten certeza de que quere "
 "eliminalas?"
 
-#: ../mail/e-mail-reader-utils.c:2023
+#: ../mail/e-mail-reader-utils.c:2345
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe"
@@ -15815,13 +15850,13 @@ msgstr[1] "Gardar mensaxes"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2044
+#: ../mail/e-mail-reader-utils.c:2366
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
 msgstr[1] "Mensaxes"
 
-#: ../mail/e-mail-reader-utils.c:2413
+#: ../mail/e-mail-reader-utils.c:2739
 msgid "Parsing message"
 msgstr "Analizando mensaxe"
 
@@ -15833,11 +15868,21 @@ msgstr "O mensaxe non ten contido de texto."
 msgid "Flag to Follow Up"
 msgstr "Marcar para facer seguimento"
 
+#: ../mail/e-mail-ui-session.c:804
+#, c-format
+msgid "%s authentication failed"
+msgstr "A autenticación %s fallou"
+
+#: ../mail/e-mail-ui-session.c:854
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "Non foi posíbel atopar os datos para o UID «%s»"
+
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1491
+#: ../mail/em-composer-utils.c:1507
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -15845,24 +15890,24 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} ás ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:1497
+#: ../mail/em-composer-utils.c:1513
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reencamiñada --------"
 
-#: ../mail/em-composer-utils.c:1502
+#: ../mail/em-composer-utils.c:1518
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2652
+#: ../mail/em-composer-utils.c:2668
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3047
+#: ../mail/em-composer-utils.c:3074
 msgid "Posting destination"
 msgstr "Destino da publicación"
 
-#: ../mail/em-composer-utils.c:3052
+#: ../mail/em-composer-utils.c:3079
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
@@ -15916,9 +15961,8 @@ msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
 #: ../mail/em-folder-selector.c:398
-#, fuzzy
 msgid "Create a new folder"
-msgstr "Crear un novo cartafol de correo"
+msgstr "Crear un novo cartafol"
 
 #: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
@@ -15944,12 +15988,12 @@ msgstr "Movendo o cartafol %s"
 msgid "Copying folder %s"
 msgstr "Copiando o cartafol %s"
 
-#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2309
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2470
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2311
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2472
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes ao cartafol %s"
@@ -15989,7 +16033,7 @@ msgid "Subscribe To _All"
 msgstr "Subscribirse a _todos"
 
 #: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1685
 msgid "_Unsubscribe"
 msgstr "Cancelar a s_ubscrición"
 
@@ -16026,7 +16070,7 @@ msgid "Su_bscribe"
 msgstr "Su_bscribir"
 
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Unsubscribe from the selected folder"
 msgstr "Cancelar a subscrición ao cartafol seleccionado"
 
@@ -16051,8 +16095,8 @@ msgid "Refresh the folder list"
 msgstr "Actualizar a lista de cartafoles"
 
 #: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
+#: ../modules/mail/e-mail-shell-view-actions.c:1657
 msgid "_Refresh"
 msgstr "_Actualizar"
 
@@ -16061,7 +16105,7 @@ msgid "Stop the current operation"
 msgstr "Deter a operación actual"
 
 #: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:1037
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
 msgid "_Stop"
 msgstr "_Deter"
 
@@ -16213,200 +16257,205 @@ msgstr "Expresión"
 
 #: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
 #: ../mail/vfoldertypes.xml.in.h:26
-msgid "Date sent"
-msgstr "Data de envío"
+msgid "Free Form Expression"
+msgstr "Expresión libre de forma"
 
 #: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
 #: ../mail/vfoldertypes.xml.in.h:27
-msgid "is before"
-msgstr "é anterior a"
+msgid "Date sent"
+msgstr "Data enviada"
 
 #: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
 #: ../mail/vfoldertypes.xml.in.h:28
-msgid "is after"
-msgstr "é posterior a"
+msgid "is before"
+msgstr "é anterior a"
 
 #: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
 #: ../mail/vfoldertypes.xml.in.h:29
-msgid "Date received"
-msgstr "Data de recepción"
+msgid "is after"
+msgstr "é posterior a"
 
 #: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
 #: ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "Data de recepción"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
+#: ../mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "Etiqueta"
 
-#: ../mail/filtertypes.xml.in.h:29 ../mail/message-list.etspec.h:3
-#: ../mail/searchtypes.xml.in.h:31 ../mail/vfoldertypes.xml.in.h:31
+#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
+#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
 msgid "Score"
 msgstr "Puntuación"
 
-#: ../mail/filtertypes.xml.in.h:32 ../mail/searchtypes.xml.in.h:34
-#: ../mail/vfoldertypes.xml.in.h:34
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
 msgid "Size (kB)"
 msgstr "Tamaño (KB)"
 
-#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
-#: ../mail/vfoldertypes.xml.in.h:36
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: ../mail/filtertypes.xml.in.h:36 ../mail/searchtypes.xml.in.h:39
-#: ../mail/vfoldertypes.xml.in.h:39
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
 msgid "Important"
 msgstr "Importante"
 
 #. Past tense, as in "has been read".
-#: ../mail/filtertypes.xml.in.h:37 ../mail/mail-dialogs.ui.h:15
-#: ../mail/searchtypes.xml.in.h:40 ../mail/vfoldertypes.xml.in.h:40
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Read"
 msgstr "Ler"
 
-#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-config.ui.h:117
-#: ../mail/vfoldertypes.xml.in.h:41
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:120
+#: ../mail/vfoldertypes.xml.in.h:42
 msgid "Junk"
 msgstr "Correo lixo"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:41
-#: ../mail/vfoldertypes.xml.in.h:42
+#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:43
 msgid "Follow Up"
 msgstr "Seguimento"
 
-#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
-#: ../mail/vfoldertypes.xml.in.h:43
+#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
+#: ../mail/vfoldertypes.xml.in.h:44
 msgid "is Flagged"
 msgstr "está marcado"
 
-#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
-#: ../mail/vfoldertypes.xml.in.h:44
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
 msgid "is not Flagged"
 msgstr "non 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:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
 msgid "Completed On"
 msgstr "Completado o"
 
-#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
-#: ../mail/vfoldertypes.xml.in.h:46
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
 msgid "is set"
 msgstr "está estabelecido"
 
-#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
-#: ../mail/vfoldertypes.xml.in.h:47
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
 msgid "is not set"
 msgstr "non está estabelecido"
 
-#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
-#: ../mail/vfoldertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
 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:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
 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:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
 msgid "Message Header"
 msgstr "Cabeceira da mensaxe"
 
-#: ../mail/filtertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:52
 msgid "Source Account"
 msgstr "Conta de orixe"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:53
 msgid "Pipe to Program"
 msgstr "Canalizar para o programa"
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:54
 msgid "returns"
 msgstr "retorna"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:55
 msgid "does not return"
 msgstr "non retorna"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns greater than"
 msgstr "retorna maior que"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:57
 msgid "returns less than"
 msgstr "retorna menor que"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:58
 msgid "Junk Test"
 msgstr "Proba de correo lixo"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:59
 msgid "Message is Junk"
 msgstr "A mensaxe é un correo lixo"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:60
 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:61 ../mail/vfoldertypes.xml.in.h:55
 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:62 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:56
 msgid "Match All"
 msgstr "Coincidir todo"
 
-#: ../mail/filtertypes.xml.in.h:65
+#: ../mail/filtertypes.xml.in.h:66
 msgid "Stop Processing"
 msgstr "Deter o procesamento"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:67
 msgid "Set Label"
 msgstr "Estabelecer a etiqueta"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Assign Color"
 msgstr "Asignar unha cor"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Unset Color"
 msgstr "Quitar cor"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Assign Score"
 msgstr "Asignar unha puntuación"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Adjust Score"
 msgstr "Axustar a puntuación"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:72
 msgid "Set Status"
 msgstr "Estabelecer o estado"
 
-#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:37
-#: ../mail/vfoldertypes.xml.in.h:37
+#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38
+#: ../mail/vfoldertypes.xml.in.h:38
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: ../mail/filtertypes.xml.in.h:73
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Unset Status"
 msgstr "Desfacer a definición de estado"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:75
 msgid "Beep"
 msgstr "Son de aviso"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Play Sound"
 msgstr "Reproducir un son"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Run Program"
 msgstr "Executar o programa"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:78
 msgid "Forward to"
 msgstr "Reencamiñar a"
 
@@ -16574,13 +16623,12 @@ msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Codificar nomes de ficheiro á forma de _Outlook/GMail\""
 
 #: ../mail/mail-config.ui.h:12
-#, fuzzy
 msgid "Send messages through Outbo_x folder"
-msgstr "Gardando a mensaxe no cartafol de saída."
+msgstr "Enviar mensaxes mediante o cartafol Saí_da"
 
 #: ../mail/mail-config.ui.h:13
 msgid "Number of characters for word w_rapping:"
-msgstr ""
+msgstr "Numero de caracteres para o _axuste de palabra:"
 
 #: ../mail/mail-config.ui.h:14
 msgid "Ch_aracter encoding:"
@@ -16716,9 +16764,8 @@ msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:51
-#, fuzzy
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
-msgstr "Enviar unha m_ensaxe co asunto baleiro"
+msgstr "Enviando un mensaxe usando unha _tecla rápida (Ctrl+Intro)"
 
 #: ../mail/mail-config.ui.h:52
 msgid "Confirmations"
@@ -16826,7 +16873,7 @@ msgid "Highlight _quotations with"
 msgstr "Realzar as _citas con"
 
 #: ../mail/mail-config.ui.h:87
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Pick a color"
 msgstr "Seleccionar unha cor"
 
@@ -16858,103 +16905,114 @@ msgstr "Baleirar os cartafoles do _lixo"
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar antes de e_xpurgar un cartafol"
 
-#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.ui.h:95
+msgid "Archive Mail"
+msgstr "Arquivar correo"
+
 #: ../mail/mail-config.ui.h:96
+msgid "On This Computer A_rchive folder:"
+msgstr "Cartafol Ar_quivo Neste computador:"
+
+#: ../mail/mail-config.ui.h:97
+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:99
 msgid "_Show animated images"
 msgstr "Mo_strar as imaxes animadas"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 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:98
+#: ../mail/mail-config.ui.h:101
 msgid "Loading Images"
 msgstr "Cargando as imaxes"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "_Never load images from the Internet"
 msgstr "_Non cargar nunca as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "_Load images only in messages from contacts"
 msgstr "Ca_rgar as imaxes só nas mensaxes dos contactos"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "_Always load images from the Internet"
 msgstr "C_argar sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:105
 msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
-#: ../mail/mail-config.ui.h:103 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:106 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:107
 msgid "Sender Photograph"
 msgstr "Fotografía do remitente"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:108
 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:106
+#: ../mail/mail-config.ui.h:109
 msgid "Search gra_vatar.com for the photograph of sender"
-msgstr ""
+msgstr "Buscar en gra_vatar.com a fotografía do emisor"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:110
 msgid "Displayed Message Headers"
 msgstr "Mostrar as cabeceiras da mensaxe"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:111
 msgid "Mail Headers Table"
 msgstr "Táboa de cabeceiras de correo"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:112
 #: ../modules/addressbook/autocompletion-config.c:117
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Formato da data e da hora"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:114
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar as _mensaxes entrantes para detectar correo lixo"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
 msgid "_Delete junk messages"
 msgstr "_Eliminar o correo lixo"
 
-#: ../mail/mail-config.ui.h:113
-#, fuzzy
+#: ../mail/mail-config.ui.h:116
 msgid "Just Test Options"
-msgstr "Opcións de personali_zación"
+msgstr "Só opcións de proba"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 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:115
+#: ../mail/mail-config.ui.h:118
 msgid "_Lookup in local address book only"
 msgstr "Buscar só nas axendas de enderezos _locais"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:119
 msgid "Check cu_stom headers for junk"
 msgstr "Comprobar as cabeceiras personalizada_s para detectar correo lixo"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:121
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "Sen cifrado"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:122
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:123
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
@@ -17243,7 +17301,7 @@ msgstr ""
 "eliminadas de todos os cartafoles?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
@@ -17729,9 +17787,8 @@ msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "O cartafol «{0}» non contén ningunha mensaxe duplicada."
 
 #: ../mail/mail.error.xml.h:155
-#, fuzzy
 msgid "Failed to connect account &quot;{0}&quot;."
-msgstr "Produciuse un erro ao desconectar a conta &quot;{0}&quot;."
+msgstr "Produciuse un fallo ao conectarse á conta &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:156
 msgid "Failed to disconnect account &quot;{0}&quot;."
@@ -17750,39 +17807,58 @@ msgid "{0}"
 msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
+msgid "Message is not available in offline mode."
+msgstr "A mensaxe non está dispoñíbel en modo desconectado."
+
+#: ../mail/mail.error.xml.h:161
+msgid ""
+"This can be due to the message not being downloaded yet. The folder, or the "
+"account, can be marked for offline synchronization. Then, once the account "
+"is online again, use File-&gt;Download Messages for Offline Usage, when this "
+"folder is selected, to make sure that all the messages in the folder will be "
+"available in offline mode."
+msgstr ""
+"Isto pode ser porque o mensxe aínda non se descargou. O cartafol, ou a "
+"conta, pódense marcar para sincronizarse en modo desconectado. Entón, cando "
+"a conta volva a estar en liña, use Arquivo-&gt;Descargar mensaxes para usar "
+"en modo desconectado, cando este cartafol estea seleccionado, para "
+"asegurarse de que todos os mensaxes do cartafol estarán dispoñíbeis en modo "
+"desconectado."
+
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to open folder."
 msgstr "Produciuse un erro ao abrir o cartafol."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to find duplicate messages."
 msgstr "Produciuse un erro ao buscar as mensaxes duplicadas."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to retrieve messages."
 msgstr "Produciuse un erro ao obter as mensaxes."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to mark messages as read."
 msgstr "Produciuse un erro ao marcar as mensaxes como lidas."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to remove attachments from messages."
 msgstr "Produciuse un erro ao retirar os anexos das mensaxes."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:168
 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:167
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to save messages to disk."
 msgstr "Produciuse un erro ao gardar as mensaxes ao disco."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:170
 msgid "Hidden file is attached."
 msgstr "Existe un ficheiro oculto adxunto."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:171
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -17790,26 +17866,46 @@ 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:170
+#: ../mail/mail.error.xml.h:172
 msgid "Printing failed."
 msgstr "Produciuse un fallo ao imprimir."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:173
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "A impresora respondeu &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:174
 msgid "Could not perform this operation on {0}."
 msgstr "Non é posíbel realizar esta operación en {0}."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:175
 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:174
+#: ../mail/mail.error.xml.h:176
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Mensaxe desde a conta &quot;{0}&quot;:"
 
+#: ../mail/mail.error.xml.h:177
+msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgstr ""
+"Produciuse un fallo ao marcar a conversa para ignorala no cartafol «{0}»"
+
+#: ../mail/mail.error.xml.h:178
+msgid "Failed to unmark thread from being ignored in folder '{0}'"
+msgstr "Produciuse un fallo ao desmarcar o fío como ignorada no cartafol «{0}»"
+
+#: ../mail/mail.error.xml.h:179
+msgid "Failed to mark subthread to be ignored in folder '{0}'"
+msgstr ""
+"Produciuse un fallo ao marcar a sub-conversa como ignorada nun cartafol «{0}»"
+
+#: ../mail/mail.error.xml.h:180
+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-send-recv.c:191
 msgid "Canceling..."
 msgstr "Cancelando…"
@@ -17838,17 +17934,17 @@ msgstr "Comprobando se hai correo novo en «%s»"
 #: ../mail/mail-send-recv.c:1421
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
-msgstr ""
+msgstr "Eliminando lixo e purgando lixo en «%s»"
 
 #: ../mail/mail-send-recv.c:1423
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting junk at '%s'"
-msgstr "Conectando novamente con %s"
+msgstr "Eliminar lixo en «%s»"
 
 #: ../mail/mail-send-recv.c:1425
-#, fuzzy, c-format
+#, c-format
 msgid "Expunging trash at '%s'"
-msgstr "Baleirando o lixo de «%s»"
+msgstr "Purgando o lixo en «%s»"
 
 #: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
@@ -17862,89 +17958,89 @@ msgstr "Editar o cartafol de busca"
 msgid "New Search Folder"
 msgstr "Novo cartafol de busca"
 
-#: ../mail/message-list.c:287
+#: ../mail/message-list.c:291
 msgid "Unseen"
 msgstr "Sen ler"
 
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:292
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:293
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:294
 msgid "Forwarded"
 msgstr "Reencamiñada"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:295
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensaxes sen ler"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:296
 msgid "Multiple Messages"
 msgstr "Múltiples mensaxes"
 
-#: ../mail/message-list.c:305
+#: ../mail/message-list.c:309
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:310
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:314
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:315
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5798
+#: ../mail/message-list.c:459 ../mail/message-list.c:5971
 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:1885 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1894
+#: ../mail/message-list.c:2050
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
 # (pofilter) variables: do not translate: %a, %l, %p
-#: ../mail/message-list.c:1906
+#: ../mail/message-list.c:2062
 msgid "%a %l:%M %p"
 msgstr "O %a ás %l:%M %p"
 
 # (pofilter) variables: do not translate: %b, %l, %p
-#: ../mail/message-list.c:1914
+#: ../mail/message-list.c:2070
 msgid "%b %d %l:%M %p"
 msgstr "O %b %d ás %l:%M %p"
 
 # (pofilter) variables: do not translate: %b
-#: ../mail/message-list.c:1916
+#: ../mail/message-list.c:2072
 msgid "%b %d %Y"
 msgstr "O %b %d de %Y"
 
-#: ../mail/message-list.c:2796
+#: ../mail/message-list.c:2960
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensaxes visíbeis"
 
-#: ../mail/message-list.c:3440 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3610 ../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:4747
+#: ../mail/message-list.c:4918
 msgid "Follow-up"
 msgstr "Seguimento"
 
-#: ../mail/message-list.c:5735
+#: ../mail/message-list.c:5908
 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 "
@@ -17956,7 +18052,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:5743
+#: ../mail/message-list.c:5916
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes neste cartafol."
 
@@ -17992,38 +18088,43 @@ msgstr "Asunto - Recortado"
 msgid "Any header"
 msgstr "Calquera cabeceira"
 
-#: ../mail/searchtypes.xml.in.h:54
+#: ../mail/searchtypes.xml.in.h:55
 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:2095
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2063
 msgid "Recipients contain"
 msgstr "Os destinatarios conteñen"
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2088
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2056
 msgid "Message contains"
 msgstr "A mensaxe contén"
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2109
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2077
 msgid "Subject contains"
 msgstr "O asunto contén"
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2102
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
 msgid "Sender contains"
 msgstr "O remitente contén"
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2081
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Body contains"
 msgstr "O corpo contén"
 
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
+msgid "Free form expression"
+msgstr "Expresión libre de forma"
+
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../modules/addressbook/autocompletion-config.c:123
-#: ../modules/mail/em-mailer-prefs.c:1222
+#: ../modules/mail/em-mailer-prefs.c:1234
 msgid "_Table column:"
 msgstr "Columna da _táboa:"
 
@@ -18074,7 +18175,7 @@ msgid "_Contact"
 msgstr "_Contacto"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1081
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Create a new contact"
 msgstr "Crear un contacto novo"
 
@@ -18084,7 +18185,7 @@ msgid "Contact _List"
 msgstr "_Lista de contactos"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1088
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
 msgid "Create a new contact list"
 msgstr "Crear unha lista de contactos nova"
 
@@ -18094,7 +18195,7 @@ msgid "Address _Book"
 msgstr "_Axenda de enderezos"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:1004
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Create a new address book"
 msgstr "Crear unha axenda de enderezos nova"
 
@@ -18107,262 +18208,262 @@ 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:578
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:520
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
 msgid "Save as vCard"
 msgstr "Gardar como vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:981
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Co_py All Contacts To..."
 msgstr "Co_piar todos os contactos a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copiar os contactos da axenda de enderezos seleccionada a outra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "D_elete Address Book"
 msgstr "_Eliminar a axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
 msgid "Delete the selected address book"
 msgstr "Eliminar a axenda seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver todos os contactos a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
 msgid "Move the contacts of the selected address book to another"
 msgstr "Mover os contactos da axenda de enderezos seleccionada a outra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1002
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Address _Book Properties"
 msgstr "Propiedades da a_xenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1011
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Show properties of the selected address book"
 msgstr "Mostrar as propiedades da axenda de enderezos seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
 #: ../modules/calendar/e-cal-shell-view-actions.c:1254
 #: ../modules/calendar/e-memo-shell-view-actions.c:578
 #: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Refresh the selected address book"
 msgstr "Actualizar o caderno de enderezos seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Address Book _Map"
 msgstr "_Mapa do caderno de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/addressbook/e-book-shell-view-actions.c:967
 msgid "Show map with all contacts from selected address book"
 msgstr ""
 "Mostrar o mapa con tódolos contactos do caderno de enderezos seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/addressbook/e-book-shell-view-actions.c:972
 #: ../modules/calendar/e-cal-shell-view-actions.c:1261
 #: ../modules/calendar/e-memo-shell-view-actions.c:585
 #: ../modules/calendar/e-task-shell-view-actions.c:710
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1664
 msgid "_Rename..."
 msgstr "_Renomear…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1032
+#: ../modules/addressbook/e-book-shell-view-actions.c:974
 msgid "Rename the selected address book"
 msgstr "Renomear a axenda de enderezos seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1039
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Stop loading"
 msgstr "Deter a carga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1044
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 msgid "_Copy Contact To..."
 msgstr "_Copiar o contacto a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1046
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Copy selected contacts to another address book"
 msgstr "Copiar os contactos seleccionados a outra axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "_Delete Contact"
 msgstr "E_liminar o contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "_Find in Contact..."
 msgstr "_Buscar no contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1060
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "Search for text in the displayed contact"
 msgstr "Buscar un texto no contacto mostrado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1065
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "_Forward Contact..."
 msgstr "_Reencamiñar o contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Send selected contacts to another person"
 msgstr "Enviar os contactos seleccionados a outra persoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "_Move Contact To..."
 msgstr "_Mover o contacto a…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
 msgid "Move selected contacts to another address book"
 msgstr "Mover os contactos seleccionados a outra axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1079
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "_New Contact..."
 msgstr "Contacto _novo…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1086
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "New Contact _List..."
 msgstr "_Lista de contactos nova…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "_Open Contact"
 msgstr "Abrir _o contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1095
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1100
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "_Send Message to Contact..."
 msgstr "_Enviar unha mensaxe ao contacto…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1102
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "Send a message to the selected contacts"
 msgstr "Enviar unha mensaxe aos contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1109
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
 #: ../modules/calendar/e-cal-shell-view-actions.c:1417
 #: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Actions"
 msgstr "_Accións"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
 #: ../modules/calendar/e-memo-shell-view-actions.c:622
 #: ../modules/calendar/e-task-shell-view-actions.c:775
-#: ../modules/mail/e-mail-shell-view-actions.c:1868
+#: ../modules/mail/e-mail-shell-view-actions.c:1829
 msgid "_Preview"
 msgstr "Vista _previa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1137
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "Address Book Map"
 msgstr "Mapa do caderno de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
 msgid "Contact _Preview"
 msgstr "Vista _previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1171
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "Show contact preview window"
 msgstr "Mostrar a xanela de vista previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1177
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
 msgid "Show _Maps"
 msgstr "Mostrar _mapas"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1179
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
 msgid "Show maps in contact preview window"
 msgstr "Mostrar mapas na xanela de vista previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1198
+#: ../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:1998
+#: ../modules/mail/e-mail-shell-view-actions.c:1959
 msgid "_Classic View"
 msgstr "Vista _clásica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1200
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Show contact preview below the contact list"
 msgstr "Mostrar a vista previa do contacto embaixo da lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../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:2005
+#: ../modules/mail/e-mail-shell-view-actions.c:1966
 msgid "_Vertical View"
 msgstr "Vista _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show contact preview alongside the contact list"
 msgstr "Mostrar a vista previa do contacto ao carón da lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1222
+#: ../modules/addressbook/e-book-shell-view-actions.c:1164
 #: ../modules/calendar/e-cal-shell-view-actions.c:1594
 #: ../modules/calendar/e-memo-shell-view-actions.c:716
 #: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Unmatched"
 msgstr "Sen coincidencias"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1232
+#: ../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:2074
+#: ../modules/mail/e-mail-shell-view-actions.c:2035
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1265
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Print all shown contacts"
 msgstr "Imprimir os contactos mostrados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1272
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 msgid "Preview the contacts to be printed"
 msgstr "Previsualizar os contactos que se van imprimir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1279
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Print selected contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1294
+#: ../modules/addressbook/e-book-shell-view-actions.c:1236
 msgid "S_ave Address Book as vCard"
 msgstr "G_ardar a axenda de enderezos como VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1296
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr ""
 "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:1302
-#: ../modules/addressbook/e-book-shell-view-actions.c:1312
+#: ../modules/addressbook/e-book-shell-view-actions.c:1244
+#: ../modules/addressbook/e-book-shell-view-actions.c:1254
 msgid "_Save as vCard..."
 msgstr "_Gardar como vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1304
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
 msgid "Save selected contacts as a vCard"
 msgstr "Gardar os contactos seleccionados como unha VCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:311
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr "_Reencamiñar os contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr "_Reencamiñar o contacto"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "Enviar unha _mensaxe aos contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "Enviar unha _mensaxe á lista"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
@@ -18466,7 +18567,7 @@ msgid "Back up complete"
 msgstr "Copia de seguranza completada"
 
 #: ../modules/backup-restore/evolution-backup-tool.c:330
-#: ../modules/backup-restore/evolution-backup-tool.c:662
+#: ../modules/backup-restore/evolution-backup-tool.c:665
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
@@ -18486,45 +18587,45 @@ msgstr "Cargando os axustes do Evolution"
 msgid "Removing temporary back up files"
 msgstr "Retirando os ficheiros temporais da copia de seguranza"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:647
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Reloading registry service"
 msgstr "Recargando o servizo de rexistro"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:850
+#: ../modules/backup-restore/evolution-backup-tool.c:853
 msgid "Evolution Back Up"
 msgstr "Respaldo de Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:851
+#: ../modules/backup-restore/evolution-backup-tool.c:854
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Facendo a copia de seguranza no cartafol %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:855
+#: ../modules/backup-restore/evolution-backup-tool.c:858
 msgid "Evolution Restore"
 msgstr "Restabelecemento do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:856
+#: ../modules/backup-restore/evolution-backup-tool.c:859
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restabelecendo desde o cartafol %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:925
+#: ../modules/backup-restore/evolution-backup-tool.c:928
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:926
+#: ../modules/backup-restore/evolution-backup-tool.c:929
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Agarde mentres o Evolution fai unha copia de seguranza dos datos."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:928
+#: ../modules/backup-restore/evolution-backup-tool.c:931
 msgid "Restoring Evolution Data"
 msgstr "Restabelecendo os datos do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:929
+#: ../modules/backup-restore/evolution-backup-tool.c:932
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Agarde mentres o Evolution restabelece os datos."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:951
+#: ../modules/backup-restore/evolution-backup-tool.c:954
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto podería levar algún tempo dependendo da cantidade de datos da súa conta."
@@ -18612,9 +18713,8 @@ msgid "Bogofilter"
 msgstr "Bogofilter"
 
 #: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
-#, fuzzy
 msgid "Junk filter using Bogofilter"
-msgstr "Software de filtrado de SPAM:"
+msgstr "Filtro de spam usando Bogofilter"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
 msgid "Standard LDAP Port"
@@ -18692,7 +18792,7 @@ msgid "Using LDAP"
 msgstr "Usando LDAP"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Buscando"
 
@@ -18750,7 +18850,7 @@ msgid "Browse until limit is reached"
 msgstr "Examinar até chegar ao final"
 
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:204
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:220
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "URL:"
@@ -18759,61 +18859,62 @@ msgstr "URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Evitar o IfMatch (necesario no Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:413
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:422
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:431
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "Erro HTTP: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:460
 msgid "Could not parse response"
 msgstr "Non foi posíbel analizar a resposta"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:450
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
 msgid "Empty response"
 msgstr "Resposta baleira"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:458
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:477
 msgid "Unexpected reply from server"
 msgstr "Resposta non agardada do servidor"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1065
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1093
 msgid "Could not locate user's calendars"
 msgstr "Non foi posíbel atopar ningún calendario do usuario."
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1291
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1315
 msgid "Path"
 msgstr "Ruta"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:262
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:348
 #: ../modules/cal-config-google/e-google-chooser-dialog.c:198
 msgid "Choose a Calendar"
 msgstr "Elixir un calendario"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:265
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:351
 msgid "Choose a Memo List"
 msgstr "Elixir unha lista de notas"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:268
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:354
 msgid "Choose a Task List"
 msgstr "Elixir unha lista de tarefas"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:234
 msgid "Find Calendars"
 msgstr "Buscar calendarios"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:237
 msgid "Find Memo Lists"
 msgstr "Buscar lista de notas"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:240
 msgid "Find Task Lists"
 msgstr "Buscar listas de tarefas"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:258
 msgid "Email:"
 msgstr "Correo electrónico:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:263
 msgid "Server handles meeting invitations"
 msgstr "O servidor xestiona os convites a reunións"
 
@@ -18872,16 +18973,14 @@ msgstr "default:mm"
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
-#, fuzzy
 msgid "Fahrenheit (ےF)"
-msgstr "Fahrenheit (°F)"
+msgstr "Fahrenheit (ےF)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
-#, fuzzy
 msgid "Centigrade (ےC)"
-msgstr "Centigraos (°C)"
+msgstr "Centigrade (ےC)"
 
 #. Translators: This is the temperature in kelvin.
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
@@ -18898,28 +18997,24 @@ msgid "I_mport"
 msgstr "I_mportar"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:337
-#, fuzzy
 msgid "Importing an event"
-msgstr "Importando datos do Pine"
+msgstr "Importando un evento"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:341
-#, fuzzy
 msgid "Importing a memo"
-msgstr "Importando a caixa de correo"
+msgstr "Importando un recordatorio"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:345
-#, fuzzy
 msgid "Importing a task"
-msgstr "Importando datos Elm"
+msgstr "Importando unha tarefa"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "Seleccionar un calendario"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:410
-#, fuzzy
 msgid "Select a Memo List"
-msgstr "_Eliminar a lista de notas"
+msgstr "Seleccione unha lista de recordatorios"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
@@ -18930,14 +19025,12 @@ msgid "I_mport to Calendar"
 msgstr "I_mportar ao calendario"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:431
-#, fuzzy
 msgid "I_mport to Memo List"
-msgstr "_Importar ás tarefas"
+msgstr "_Importar unha lista de recordatorios"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:438
-#, fuzzy
 msgid "I_mport to Task List"
-msgstr "_Importar ás tarefas"
+msgstr "_Importar na lista de tarefas"
 
 #: ../modules/calendar/e-cal-base-shell-backend.c:186
 #: ../modules/calendar/e-cal-shell-view-actions.c:162
@@ -18955,34 +19048,34 @@ msgid "New Task List"
 msgstr "Lista de tarefas nova"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:540
-#, fuzzy, c-format
+#, c-format
 msgid "Copying an event into the calendar '%s'"
-msgstr "Copiando un evento no calendario %s"
+msgstr "Copiando un evento no calendario «%s»"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:541
-#, fuzzy, c-format
+#, c-format
 msgid "Moving an event into the calendar '%s'"
-msgstr "Movendo un evento no calendario %s"
+msgstr "Movendo un evento nun calendario «%s»"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:546
-#, fuzzy, c-format
+#, c-format
 msgid "Copying a memo into the memo list '%s'"
-msgstr "Copiando de recordatorio na lista de recordatorios «{0}»"
+msgstr "Copiando un recordatorio na lista de recordatorios «%s»"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:547
-#, fuzzy, c-format
+#, c-format
 msgid "Moving a memo into the memo list '%s'"
-msgstr "Movendo un recordatorio na lista de recordatorios «{0}»?"
+msgstr "Movendo un recordatorio na lista de recordatorios «%s»"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:552
-#, fuzzy, c-format
+#, c-format
 msgid "Copying a task into the task list '%s'"
-msgstr "Copiando unha tarefa na lista de tarefas «{0}»"
+msgstr "Copiando unha tarefa na lista de tarefas «%s»"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:553
-#, fuzzy, c-format
+#, c-format
 msgid "Moving a task into the task list '%s'"
-msgstr "Movendo unha tarefa na lista de tarefas «{0}»"
+msgstr "Movendo unha tarefa na lista de tarefas «%s»"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:650
 msgid "Calendar Selector"
@@ -19121,13 +19214,9 @@ msgstr "_Dom"
 msgid "Day _ends:"
 msgstr "A xornada _finaliza ás:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "Alertas"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Pedir a confirmación antes de eliminar elementos"
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "View Options"
+msgstr "Ver opcións"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "_Time divisions:"
@@ -19155,70 +19244,78 @@ msgstr ""
 msgid "Sc_roll Month View by a week"
 msgstr "Desp_razar a vista mensual unha semana"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Alerts"
+msgstr "Alertas"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Pedir a confirmación antes de eliminar elementos"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Display"
 msgstr "Mostrar"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Highlight t_asks due today"
 msgstr "Realzar tarefas que _vencen hoxe"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Highlight _overdue tasks"
 msgstr "Realzar tarefas _vencidas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar as tarefas terminadas despois de"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Display reminders in _notification area only"
 msgstr "Mostrar os recordatorios só na área de _notificación"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Sh_ow a reminder"
 msgstr "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:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 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:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 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:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "antes de cada aniversario"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Select the calendars for reminder notification"
 msgstr "Seleccionar os calendarios para a notificación de recordatorios"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Default Free/Busy Server"
 msgstr "Servidor predeterminado de dispoñibilidade"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Template:"
 msgstr "Modelo:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr ""
 "%u e %d substituiranse polo usuario e o dominio do enderezo de correo "
 "electrónico."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Publishing Information"
 msgstr "Información de publicación"
 
@@ -19260,7 +19357,7 @@ msgstr "Cale_ndario"
 msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:255
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
@@ -19289,9 +19386,8 @@ msgid "Purge events older than"
 msgstr "Purgar as actividades anteriores a"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:895
-#, fuzzy
 msgid "Making an occurrence movable"
-msgstr "Facer esta aparición _desprazábel"
+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.
@@ -19621,29 +19717,29 @@ msgstr "Abrir a páxina _web"
 msgid "Print the selected memo"
 msgstr "Imprimir a nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:808
+#: ../modules/calendar/e-cal-shell-view-private.c:810
 msgid "Searching next matching event"
 msgstr "Buscando o seguinte evento coincidente"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:809
+#: ../modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching previous matching event"
 msgstr "Buscando o anterior evento coincidente"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:830
+#: ../modules/calendar/e-cal-shell-view-private.c:832
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Non é posíbel atopar un evento coincidente dentro de %d ano"
 msgstr[1] "Non é posíbel atopar un evento coincidente dentro de %d anos"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:834
+#: ../modules/calendar/e-cal-shell-view-private.c:836
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Non é posíbel atopar un evento coincidente fai %d ano"
 msgstr[1] "Non é posíbel atopar un evento coincidente fai %d anos"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:857
+#: ../modules/calendar/e-cal-shell-view-private.c:859
 msgid "Cannot search with no active calendar"
 msgstr "Non é posíbel buscar sen un calendario activo"
 
@@ -19799,11 +19895,11 @@ msgstr "Imprimir a lista de notas"
 msgid "Preview the list of memos to be printed"
 msgstr "Previsualizar a lista de notas para imprimir"
 
-#: ../modules/calendar/e-memo-shell-view.c:210
+#: ../modules/calendar/e-memo-shell-view.c:212
 msgid "Delete Memos"
 msgstr "Eliminar as notas"
 
-#: ../modules/calendar/e-memo-shell-view.c:212
+#: ../modules/calendar/e-memo-shell-view.c:214
 msgid "Delete Memo"
 msgstr "Eliminar a nota"
 
@@ -19957,11 +20053,11 @@ msgstr "Imprimir a lista de tarefas"
 msgid "Preview the list of tasks to be printed"
 msgstr "Previsualizar a lista de tarefas para imprimir"
 
-#: ../modules/calendar/e-task-shell-view.c:315
+#: ../modules/calendar/e-task-shell-view.c:316
 msgid "Delete Tasks"
 msgstr "Eliminar as tarefas"
 
-#: ../modules/calendar/e-task-shell-view.c:317
+#: ../modules/calendar/e-task-shell-view.c:318
 msgid "Delete Task"
 msgstr "Eliminar a tarefa"
 
@@ -20405,6 +20501,7 @@ msgid "_Update Attendee Status"
 msgstr "_Actualizar o estado do participante"
 
 #: ../modules/itip-formatter/itip-view.c:1047
+#: ../smime/gui/certificate-manager.c:1664
 msgid "_Update"
 msgstr "_Actualizar"
 
@@ -20454,7 +20551,7 @@ msgid "Sa_ve"
 msgstr "Gar_dar"
 
 #: ../modules/itip-formatter/itip-view.c:3575
-#: ../modules/itip-formatter/itip-view.c:5022
+#: ../modules/itip-formatter/itip-view.c:5023
 msgid "Attendee status updated"
 msgstr "Actualizouse o estado de participante"
 
@@ -20484,124 +20581,124 @@ msgstr "Non é posíbel atopar esta tarefa en ningunha lista de tarefas"
 msgid "Unable to find this memo in any memo list"
 msgstr "Non é posíbel atopar esta nota en ningunha lista de notas"
 
-#: ../modules/itip-formatter/itip-view.c:4258
+#: ../modules/itip-formatter/itip-view.c:4259
 msgid "Opening the calendar. Please wait..."
 msgstr "Abrindo o calendario. Agarde…"
 
-#: ../modules/itip-formatter/itip-view.c:4263
+#: ../modules/itip-formatter/itip-view.c:4264
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versión existente desta cita"
 
-#: ../modules/itip-formatter/itip-view.c:4658
+#: ../modules/itip-formatter/itip-view.c:4659
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Non é posíbel enviar o elemento ao calendario «%s». %s"
 
-#: ../modules/itip-formatter/itip-view.c:4673
+#: ../modules/itip-formatter/itip-view.c:4674
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario «%s» como aceptado"
 
-#: ../modules/itip-formatter/itip-view.c:4678
+#: ../modules/itip-formatter/itip-view.c:4679
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario «%s» como provisional"
 
-#: ../modules/itip-formatter/itip-view.c:4684
+#: ../modules/itip-formatter/itip-view.c:4685
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario «%s» como rexeitado"
 
-#: ../modules/itip-formatter/itip-view.c:4690
+#: ../modules/itip-formatter/itip-view.c:4691
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario «%s» como cancelado"
 
-#: ../modules/itip-formatter/itip-view.c:4711
-#: ../modules/itip-formatter/itip-view.c:5168
-#: ../modules/itip-formatter/itip-view.c:5274
+#: ../modules/itip-formatter/itip-view.c:4712
+#: ../modules/itip-formatter/itip-view.c:5169
+#: ../modules/itip-formatter/itip-view.c:5275
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Gardando os cambios no calendario. Agarde…"
 
-#: ../modules/itip-formatter/itip-view.c:4752
+#: ../modules/itip-formatter/itip-view.c:4753
 msgid "Unable to parse item"
 msgstr "Non é posíbel analizar o elemento"
 
-#: ../modules/itip-formatter/itip-view.c:4945
+#: ../modules/itip-formatter/itip-view.c:4946
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador retirou o delegado %s "
 
-#: ../modules/itip-formatter/itip-view.c:4962
+#: ../modules/itip-formatter/itip-view.c:4963
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviouse unha notificación de cancelación ao delegado"
 
-#: ../modules/itip-formatter/itip-view.c:4966
+#: ../modules/itip-formatter/itip-view.c:4967
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Non foi posíbel enviar unha notificación de cancelación ao delegado"
 
-#: ../modules/itip-formatter/itip-view.c:5014
+#: ../modules/itip-formatter/itip-view.c:5015
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non é posíbel actualizar o participante. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5057
+#: ../modules/itip-formatter/itip-view.c:5058
 msgid "The meeting is invalid and cannot be updated"
 msgstr "A reunión no é válida e non pode actualizarse"
 
-#: ../modules/itip-formatter/itip-view.c:5133
+#: ../modules/itip-formatter/itip-view.c:5134
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Non foi posíbel actualizar o estado de participante debido a que o estado "
 "non é válido"
 
-#: ../modules/itip-formatter/itip-view.c:5205
-#: ../modules/itip-formatter/itip-view.c:5244
+#: ../modules/itip-formatter/itip-view.c:5206
+#: ../modules/itip-formatter/itip-view.c:5245
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Non foi posíbel actualizar o estado de participante porque xa non existe o "
 "elemento"
 
-#: ../modules/itip-formatter/itip-view.c:5307
+#: ../modules/itip-formatter/itip-view.c:5308
 msgid "Meeting information sent"
 msgstr "Enviouse a información da reunión"
 
-#: ../modules/itip-formatter/itip-view.c:5312
+#: ../modules/itip-formatter/itip-view.c:5313
 msgid "Task information sent"
 msgstr "Enviouse a información da tarefa"
 
-#: ../modules/itip-formatter/itip-view.c:5317
+#: ../modules/itip-formatter/itip-view.c:5318
 msgid "Memo information sent"
 msgstr "Enviouse a información da nota"
 
-#: ../modules/itip-formatter/itip-view.c:5328
+#: ../modules/itip-formatter/itip-view.c:5329
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Non é posíbel enviar a información da reunión, a reunión non existe"
 
-#: ../modules/itip-formatter/itip-view.c:5333
+#: ../modules/itip-formatter/itip-view.c:5334
 msgid "Unable to send task information, the task does not exist"
 msgstr "Non é posíbel enviar a información da tarefa, a tarefa non existe"
 
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../modules/itip-formatter/itip-view.c:5339
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Non é posíbel enviar a información da nota, a nota non existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5403
+#: ../modules/itip-formatter/itip-view.c:5404
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5408
+#: ../modules/itip-formatter/itip-view.c:5409
 msgid "Save Calendar"
 msgstr "Gardar o calendario"
 
-#: ../modules/itip-formatter/itip-view.c:5457
-#: ../modules/itip-formatter/itip-view.c:5470
+#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5471
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexado non é válido"
 
-#: ../modules/itip-formatter/itip-view.c:5458
-#: ../modules/itip-formatter/itip-view.c:5471
+#: ../modules/itip-formatter/itip-view.c:5459
+#: ../modules/itip-formatter/itip-view.c:5472
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -20609,15 +20706,15 @@ msgstr ""
 "A mensaxe di que contén un calendario pero o calendario non é un iCalendar "
 "correcto."
 
-#: ../modules/itip-formatter/itip-view.c:5513
-#: ../modules/itip-formatter/itip-view.c:5543
-#: ../modules/itip-formatter/itip-view.c:5644
-msgid "The item in the calendar is not valid"
-msgstr "O elemento do calendario non é válido"
-
 #: ../modules/itip-formatter/itip-view.c:5514
 #: ../modules/itip-formatter/itip-view.c:5544
 #: ../modules/itip-formatter/itip-view.c:5645
+msgid "The item in the calendar is not valid"
+msgstr "O elemento do calendario non é válido"
+
+#: ../modules/itip-formatter/itip-view.c:5515
+#: ../modules/itip-formatter/itip-view.c:5545
+#: ../modules/itip-formatter/itip-view.c:5646
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -20625,11 +20722,11 @@ msgstr ""
 "A mensaxe contén un calendario pero o calendario non contén actividades, "
 "tarefas nin información de dispoñibilidade"
 
-#: ../modules/itip-formatter/itip-view.c:5559
+#: ../modules/itip-formatter/itip-view.c:5560
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexado contén múltiples elementos"
 
-#: ../modules/itip-formatter/itip-view.c:5560
+#: ../modules/itip-formatter/itip-view.c:5561
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -20637,24 +20734,24 @@ msgstr ""
 "Para procesar todos estes elementos, debería gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../modules/itip-formatter/itip-view.c:6062
+#: ../modules/itip-formatter/itip-view.c:6063
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ningún"
 
-#: ../modules/itip-formatter/itip-view.c:6078
+#: ../modules/itip-formatter/itip-view.c:6079
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../modules/itip-formatter/itip-view.c:6238
+#: ../modules/itip-formatter/itip-view.c:6239
 msgid "This meeting recurs"
 msgstr "Esta cita repítese"
 
-#: ../modules/itip-formatter/itip-view.c:6241
+#: ../modules/itip-formatter/itip-view.c:6242
 msgid "This task recurs"
 msgstr "Esta tarefa repítese"
 
-#: ../modules/itip-formatter/itip-view.c:6244
+#: ../modules/itip-formatter/itip-view.c:6245
 msgid "This memo recurs"
 msgstr "Esta nota repítese"
 
@@ -20894,385 +20991,385 @@ msgctxt "label"
 msgid "None"
 msgstr "Ningún"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:749
+#: ../modules/mail/e-mail-shell-view-actions.c:706
 msgid "Marking messages as read..."
 msgstr "Marcando mensaxes como lidas…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1566
 msgid "_Disable Account"
 msgstr "_Desactivar a conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1568
 msgid "Disable this account"
 msgstr "Desactivar esta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Retirar permanentemente todas as mensaxes eliminadas de todos os cartafoles"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Edit properties of this account"
 msgstr "Modificar as propiedades desta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
 msgid "Refresh list of folders of this account"
 msgstr "Actualizar a lista de cartafoles para esta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1594
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar as mensaxes para o uso sen conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Descargar as mensaxes das contas e cartafoles marcados para uso sen conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saída"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "_Copy Folder To..."
 msgstr "_Copiar o cartafol a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1649
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "Copy the selected folder into another folder"
 msgstr "Copiar o cartafol seleccionado noutro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1656
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Permanently remove this folder"
 msgstr "Retirar permanentemente este cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1661
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
 msgid "E_xpunge"
 msgstr "Com_pactar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1663
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Retirar permanentemente as mensaxes eliminadas deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:1729
 msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1770
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "Mark all messages in the folder as read"
 msgstr "Marcar todas as mensaxes do cartafol como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1636
 msgid "_Move Folder To..."
 msgstr "_Mover o cartafol a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Move the selected folder into another folder"
 msgstr "Mover o cartafol seleccionado a outro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1643
 msgid "_New..."
 msgstr "_Novo…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "Create a new folder for storing mail"
 msgstr "Crear un cartafol novo para gardar o correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Change the properties of this folder"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1705
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Change the name of this folder"
 msgstr "Modificar o nome deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:1671
 msgid "Select Message _Thread"
 msgstr "Seleccionar o _fío desta mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1712
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Seleccionar todas as mensaxes do mesmo fío que a mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1678
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar o fío sec_undario desta mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas as respostas á mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1692
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Retirar permanentemente todas as mensaxes eliminadas de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1699
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1708
 msgid "N_one"
 msgstr "Nin_gún"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1722
 msgid "_Manage Subscriptions"
 msgstr "Xestionar as _subscricións"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1763
-#: ../modules/mail/e-mail-shell-view-actions.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1808
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "Subscribir ou eliminar as subscricións a cartafoles en servidores remotos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
-#: ../modules/mail/e-mail-shell-view-actions.c:1796
+#: ../modules/mail/e-mail-shell-view-actions.c:1736
+#: ../modules/mail/e-mail-shell-view-actions.c:1757
 msgid "Send / _Receive"
 msgstr "Enviar / _Recibir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1777
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar os elementos da cola e obter os elementos novos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1782
+#: ../modules/mail/e-mail-shell-view-actions.c:1743
 msgid "R_eceive All"
 msgstr "R_ecibir todos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1784
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "Receive new items from all accounts"
 msgstr "Recibir os elementos novos de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1789
+#: ../modules/mail/e-mail-shell-view-actions.c:1750
 msgid "_Send All"
 msgstr "_Enviar todos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1791
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 msgid "Send queued items in all accounts"
 msgstr "Enviar os elementos da cola de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1819
+#: ../modules/mail/e-mail-shell-view-actions.c:1780
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operación de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1824
+#: ../modules/mail/e-mail-shell-view-actions.c:1785
 msgid "Collapse All _Threads"
 msgstr "Pregar todos os _fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1826
+#: ../modules/mail/e-mail-shell-view-actions.c:1787
 msgid "Collapse all message threads"
 msgstr "Pregar todos os fíos de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1831
+#: ../modules/mail/e-mail-shell-view-actions.c:1792
 msgid "E_xpand All Threads"
 msgstr "D_espregar todos os fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1794
 msgid "Expand all message threads"
 msgstr "Despregar todas as conversas do fío"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1838
+#: ../modules/mail/e-mail-shell-view-actions.c:1799
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1840
+#: ../modules/mail/e-mail-shell-view-actions.c:1801
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear ou editar regras para o filtrado do correo novo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1845
+#: ../modules/mail/e-mail-shell-view-actions.c:1806
 msgid "_Subscriptions..."
 msgstr "_Subscricións…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1854
+#: ../modules/mail/e-mail-shell-view-actions.c:1815
 msgid "F_older"
 msgstr "Cartaf_ol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1822
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1878
+#: ../modules/mail/e-mail-shell-view-actions.c:1839
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca a partir da busca…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1846
 msgid "Search F_olders"
 msgstr "Cartaf_oles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1848
 msgid "Create or edit search folder definitions"
 msgstr "Crear ou editar as definicións dos cartafoles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1926
+#: ../modules/mail/e-mail-shell-view-actions.c:1887
 msgid "_New Folder..."
 msgstr "Cartafol _novo…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1954
+#: ../modules/mail/e-mail-shell-view-actions.c:1915
 msgid "Show Message _Preview"
 msgstr "Mostrar a vista _previa da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1956
+#: ../modules/mail/e-mail-shell-view-actions.c:1917
 msgid "Show message preview pane"
 msgstr "Mostrar o panel de vista previa das mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1962
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 msgid "Show _Deleted Messages"
 msgstr "Mostrar as mensaxes _eliminadas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:1925
 msgid "Show deleted messages with a line through them"
 msgstr "Mostrar as mensaxes eliminadas riscándoas."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1970
+#: ../modules/mail/e-mail-shell-view-actions.c:1931
 msgid "_Group By Threads"
 msgstr "A_grupar por fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1972
+#: ../modules/mail/e-mail-shell-view-actions.c:1933
 msgid "Threaded message list"
 msgstr "Lista de mensaxes por fío"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1978
+#: ../modules/mail/e-mail-shell-view-actions.c:1939
 msgid "_Unmatched Folder Enabled"
 msgstr "Cartafol non _coincidente activado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1980
+#: ../modules/mail/e-mail-shell-view-actions.c:1941
 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:2000
+#: ../modules/mail/e-mail-shell-view-actions.c:1961
 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:2007
+#: ../modules/mail/e-mail-shell-view-actions.c:1968
 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:2015
+#: ../modules/mail/e-mail-shell-view-actions.c:1976
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:1983
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2029
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos últimos 5 días"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2036
+#: ../modules/mail/e-mail-shell-view-actions.c:1997
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2043
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2050
+#: ../modules/mail/e-mail-shell-view-actions.c:2011
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#: ../modules/mail/e-mail-shell-view-actions.c:2018
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2064
+#: ../modules/mail/e-mail-shell-view-actions.c:2025
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2116
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteñen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2126
+#: ../modules/mail/e-mail-shell-view-actions.c:2094
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2133
+#: ../modules/mail/e-mail-shell-view-actions.c:2101
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2140
+#: ../modules/mail/e-mail-shell-view-actions.c:2108
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
-#: ../modules/mail/e-mail-shell-view.c:636
+#: ../modules/mail/e-mail-shell-view.c:700
 msgid "All Account Search"
 msgstr "Buscar en todas as contas"
 
-#: ../modules/mail/e-mail-shell-view.c:744
+#: ../modules/mail/e-mail-shell-view.c:808
 msgid "Account Search"
 msgstr "Buscar na conta"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionada, "
 msgstr[1] "%d seleccionadas, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:987
-#: ../modules/mail/e-mail-shell-view-private.c:1004
+#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminada"
 msgstr[1] "%d eliminadas"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1019
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d correo lixo"
 msgstr[1] "%d correos lixo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sen enviar"
 msgstr[1] "%d sen enviar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1046
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sen ler, "
 msgstr[1] "%d sen ler, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1082
 msgid "Trash"
 msgstr "Lixo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1561
+#: ../modules/mail/e-mail-shell-view-private.c:1569
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
@@ -21288,7 +21385,19 @@ msgstr "Cartafol"
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: ../modules/mail/em-composer-prefs.c:1177
+#: ../modules/mail/em-composer-prefs.c:1157
+msgid "Keep in Outbox"
+msgstr "Manter en Saída"
+
+#: ../modules/mail/em-composer-prefs.c:1158
+msgid "Send immediately"
+msgstr "Enviar inmediatamente"
+
+#: ../modules/mail/em-composer-prefs.c:1159
+msgid "Send after 5 minutes"
+msgstr "Despois de 5 minutos"
+
+#: ../modules/mail/em-composer-prefs.c:1232
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
@@ -21297,19 +21406,16 @@ msgid "On exit, every time"
 msgstr "Ao saír, cada vez"
 
 #: ../modules/mail/em-mailer-prefs.c:80
-#, fuzzy
 msgid "Once per day"
-msgstr "Ao saír, unha vez ao día"
+msgstr "Unha vez ao día"
 
 #: ../modules/mail/em-mailer-prefs.c:81
-#, fuzzy
 msgid "Once per week"
-msgstr "Ao saír, unha vez á semana"
+msgstr "Unha vez á semana"
 
 #: ../modules/mail/em-mailer-prefs.c:82
-#, fuzzy
 msgid "Once per month"
-msgstr "Ao saír, unha vez ao mes"
+msgstr "Unha vez ao mes"
 
 #: ../modules/mail/em-mailer-prefs.c:83
 msgid "Immediately, on folder leave"
@@ -21324,11 +21430,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:1224
+#: ../modules/mail/em-mailer-prefs.c:1236
 msgid "_Date header:"
 msgstr "_Cabeceira da data:"
 
-#: ../modules/mail/em-mailer-prefs.c:1225
+#: ../modules/mail/em-mailer-prefs.c:1237
 msgid "Show _original header value"
 msgstr "Mostrar o valor _orixinal da cabeceira"
 
@@ -21434,22 +21540,22 @@ 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:77
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
 #: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se está presente"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "Deixar que o Evolution escolla a mellor parte para mostrar."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "Mostrar en texto plano se está presente"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
@@ -21458,12 +21564,12 @@ 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:86
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
 #: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "Só mostrar en texto plano"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
 #: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -21534,9 +21640,8 @@ msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 #: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
-#, fuzzy
 msgid "Junk filter using SpamAssassin"
-msgstr "Filtra os correos non desexados usando o SpamAssassin."
+msgstr "Filtrar spam usando SpamAssassin"
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
@@ -21577,11 +21682,11 @@ msgstr "_Formatar como…"
 msgid "_Other languages"
 msgstr "_Outros idiomas"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:437
 msgid "Text Highlight"
 msgstr "Realzado do texto"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Syntax highlighting of mail parts"
 msgstr "Realzado de sintaxe das partes do correo"
 
@@ -21873,37 +21978,37 @@ msgstr "Aviso de anexos"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Avisarao se esquece engadir un anexo á mensaxe de correo."
 
-#: ../plugins/bbdb/bbdb.c:694 ../plugins/bbdb/bbdb.c:703
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:718
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr "Crear _as entradas da axenda de enderezos ao enviar as mensaxes"
 
-#: ../plugins/bbdb/bbdb.c:725
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccionar a axenda de enderezos para contactos automáticos"
 
-#: ../plugins/bbdb/bbdb.c:742
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensaxería instantánea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:757
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "_Sincronizar a información e as imaxes de contactos desde a lista de amigos "
 "do Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:764
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccionar a axenda de enderezos para a lista de amigos do Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:777
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar coa lista de _amigos agora"
 
@@ -22437,12 +22542,12 @@ msgstr "O obxecto devolto por un servidor non é válido"
 msgid "An error occurred during processing: %s"
 msgstr "Produciuse un erro ao procesar: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:854
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Non é posíbel abrir o calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:856
+#: ../plugins/mail-to-task/mail-to-task.c:858
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -22450,7 +22555,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:859
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -22458,7 +22563,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:862
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -22466,35 +22571,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:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1266
 msgid "Create an _Appointment"
 msgstr "Crear unha cit_a"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 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:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1273
 msgid "Create a Mem_o"
 msgstr "Crear unha n_ota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 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:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a _Task"
 msgstr "Crear unha _tarefa"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 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:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1290
 msgid "Create a _Meeting"
 msgstr "Crear unha _reunión"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1292
 msgid "Create a new meeting from the selected message"
 msgstr "Crear unha reunión nova a partir da mensaxe seleccionada"
 
@@ -22674,7 +22779,7 @@ msgid "_Username:"
 msgstr "_Nome do usuario:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:759
+#: ../smime/gui/certificate-manager.c:772
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
@@ -22686,8 +22791,8 @@ msgstr "_Lembrar o contrasinal"
 msgid "Publishing Location"
 msgstr "Localización da publicación"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:99
-#: ../plugins/publish-calendar/publish-format-ical.c:102
+#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "UID de orixe «%s» non válido"
@@ -22816,15 +22921,15 @@ msgstr "Seleccionar un ficheiro de destino"
 msgid "_Save As"
 msgstr "_Gardar como"
 
-#: ../plugins/save-calendar/save-calendar.c:344
+#: ../plugins/save-calendar/save-calendar.c:347
 msgid "Save the selected calendar to disk"
 msgstr "Gardar o calendario seleccionado no disco"
 
-#: ../plugins/save-calendar/save-calendar.c:375
+#: ../plugins/save-calendar/save-calendar.c:378
 msgid "Save the selected memo list to disk"
 msgstr "Gardar a lista de notas seleccionada no disco"
 
-#: ../plugins/save-calendar/save-calendar.c:406
+#: ../plugins/save-calendar/save-calendar.c:409
 msgid "Save the selected task list to disk"
 msgstr "Gardar a lista de tarefas seleccionada no disco"
 
@@ -22850,22 +22955,26 @@ msgstr "Gardar como un _modelo"
 msgid "Save as Template"
 msgstr "Gardar como un modelo"
 
-#: ../shell/e-shell.c:319
+#: ../shell/e-shell.c:326
 msgid "Preparing to go offline..."
 msgstr "Preparando a desconexión…"
 
-#: ../shell/e-shell.c:372
+#: ../shell/e-shell.c:379
 msgid "Preparing to go online..."
 msgstr "Preparando a conexión…"
 
-#: ../shell/e-shell.c:453
+#: ../shell/e-shell.c:486
 msgid "Preparing to quit"
 msgstr "Preparando a saída"
 
-#: ../shell/e-shell.c:459
+#: ../shell/e-shell.c:492
 msgid "Preparing to quit..."
 msgstr "Preparando a saída…"
 
+#: ../shell/e-shell.c:904
+msgid "Credentials are required to connect to the destination host."
+msgstr "Requírense credenciais para conectarse ao equipo de destino."
+
 #: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Buscas"
@@ -22909,7 +23018,7 @@ msgstr "Gardando o estado da interface do usuario"
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:73
+#: ../shell/e-shell-window-actions.c:72
 msgid "translator-credits"
 msgstr ""
 "Leandro Regueiro <leandro regueiro gmail com>, 2012.\n"
@@ -22930,276 +23039,276 @@ msgstr ""
 "Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas\n"
 "colaborar connosco, podes atopar máis información en http://www.trasno.net";
 
-#: ../shell/e-shell-window-actions.c:84
+#: ../shell/e-shell-window-actions.c:83
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-actions.c:340
+#: ../shell/e-shell-window-actions.c:339
 msgid "Categories Editor"
 msgstr "Editor de categorías"
 
-#: ../shell/e-shell-window-actions.c:716
+#: ../shell/e-shell-window-actions.c:715
 msgid "Bug Buddy is not installed."
 msgstr "O Bug buddy non está instalado."
 
-#: ../shell/e-shell-window-actions.c:717
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy could not be run."
 msgstr "Non foi posíbel executar o Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:895
+#: ../shell/e-shell-window-actions.c:894
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:896
 msgid "Show information about Evolution"
 msgstr "Mostrar información sobre o Evolution"
 
-#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
 msgid "_Close Window"
 msgstr "Pe_char a xanela"
 
-#: ../shell/e-shell-window-actions.c:923
+#: ../shell/e-shell-window-actions.c:922
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../shell/e-shell-window-actions.c:925
+#: ../shell/e-shell-window-actions.c:924
 msgid "Open the Evolution User Guide"
 msgstr "Abrir a guía de usuario do Evolution"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:950
 msgid "I_mport..."
 msgstr "I_mportar…"
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:952
 msgid "Import data from other programs"
 msgstr "Importar os datos doutros programas"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:957
 msgid "New _Window"
 msgstr "_Xanela nova"
 
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:959
 msgid "Create a new window displaying this view"
 msgstr "Crear unha xanela nova mostrando esta vista"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:971
 msgid "Available Cate_gories"
 msgstr "Cate_gorias dispoñíbeis"
 
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:973
 msgid "Manage available categories"
 msgstr "Xestionar as categorías dispoñíbeis"
 
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:985
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../shell/e-shell-window-actions.c:988
+#: ../shell/e-shell-window-actions.c:987
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar as teclas dos atallos do Evolution"
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:992
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:994
 msgid "Exit the program"
 msgstr "Saír do programa"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:999
 msgid "_Advanced Search..."
 msgstr "Busca _avanzada…"
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:1001
 msgid "Construct a more advanced search"
 msgstr "Construír unha busca máis avanzada"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:1008
 msgid "Clear the current search parameters"
 msgstr "Limpar os parámetros da busca actual"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:1013
 msgid "_Edit Saved Searches..."
 msgstr "_Editar as buscas gardadas…"
 
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:1015
 msgid "Manage your saved searches"
 msgstr "Xestionar as buscas gardadas"
 
-#: ../shell/e-shell-window-actions.c:1023
+#: ../shell/e-shell-window-actions.c:1022
 msgid "Click here to change the search type"
 msgstr "Prema aquí para cambiar o tipo de busca"
 
-#: ../shell/e-shell-window-actions.c:1028
+#: ../shell/e-shell-window-actions.c:1027
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
-#: ../shell/e-shell-window-actions.c:1030
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Execute the current search parameters"
 msgstr "Executar os parámetros de busca actuais"
 
-#: ../shell/e-shell-window-actions.c:1035
+#: ../shell/e-shell-window-actions.c:1034
 msgid "_Save Search..."
 msgstr "_Gardar a busca…"
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:1036
 msgid "Save the current search parameters"
 msgstr "Gardar os parámetros de busca actuais"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:1048
 msgid "Submit _Bug Report..."
 msgstr "Enviar un _informe de fallo…"
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:1050
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de fallo usando o Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1056
+#: ../shell/e-shell-window-actions.c:1055
 msgid "_Work Offline"
 msgstr "_Traballar sen conexión"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:1057
 msgid "Put Evolution into offline mode"
 msgstr "Poñer o Evolution en modo sen conexión"
 
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:1062
 msgid "_Work Online"
 msgstr "_Traballar conectado"
 
-#: ../shell/e-shell-window-actions.c:1065
+#: ../shell/e-shell-window-actions.c:1064
 msgid "Put Evolution into online mode"
 msgstr "Poñer o Evolution en modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1093
+#: ../shell/e-shell-window-actions.c:1092
 msgid "Lay_out"
 msgstr "Disp_osición"
 
-#: ../shell/e-shell-window-actions.c:1107
+#: ../shell/e-shell-window-actions.c:1106
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1114
+#: ../shell/e-shell-window-actions.c:1113
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _selector"
 
-#: ../shell/e-shell-window-actions.c:1128
+#: ../shell/e-shell-window-actions.c:1127
 msgid "_Window"
 msgstr "_Xanela"
 
-#: ../shell/e-shell-window-actions.c:1157
+#: ../shell/e-shell-window-actions.c:1156
 msgid "Show Side _Bar"
 msgstr "Mostrar a _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1159
+#: ../shell/e-shell-window-actions.c:1158
 msgid "Show the side bar"
 msgstr "Mostrar a _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1164
 msgid "Show _Buttons"
 msgstr "Mostrar os botóns"
 
-#: ../shell/e-shell-window-actions.c:1167
+#: ../shell/e-shell-window-actions.c:1166
 msgid "Show the switcher buttons"
 msgstr "Mostrar os botóns do selector"
 
-#: ../shell/e-shell-window-actions.c:1173
+#: ../shell/e-shell-window-actions.c:1172
 msgid "Show _Status Bar"
 msgstr "Mostrar a _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1174
 msgid "Show the status bar"
 msgstr "Mostrar a barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1181
+#: ../shell/e-shell-window-actions.c:1180
 msgid "Show _Tool Bar"
 msgstr "Mostrar a barra de ferramen_tas"
 
-#: ../shell/e-shell-window-actions.c:1183
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Show the tool bar"
 msgstr "Mostrar a barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1205
+#: ../shell/e-shell-window-actions.c:1204
 msgid "_Icons Only"
 msgstr "Só _iconas"
 
-#: ../shell/e-shell-window-actions.c:1207
+#: ../shell/e-shell-window-actions.c:1206
 msgid "Display window buttons with icons only"
 msgstr "Mostrar os botóns da xanela só con iconas"
 
-#: ../shell/e-shell-window-actions.c:1212
+#: ../shell/e-shell-window-actions.c:1211
 msgid "_Text Only"
 msgstr "Só _texto"
 
-#: ../shell/e-shell-window-actions.c:1214
+#: ../shell/e-shell-window-actions.c:1213
 msgid "Display window buttons with text only"
 msgstr "Mostrar os botóns da xanela só con texto"
 
-#: ../shell/e-shell-window-actions.c:1219
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Icons _and Text"
 msgstr "Icon_as e texto"
 
-#: ../shell/e-shell-window-actions.c:1221
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Display window buttons with icons and text"
 msgstr "Mostrar os botóns da xanela con iconas e texto"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1225
 msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1227
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Mostrar os botóns da xanela usando a configuración da barra de ferramentas "
 "do escritorio"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Delete Current View"
 msgstr "Eliminar a vista actual"
 
-#: ../shell/e-shell-window-actions.c:1243
+#: ../shell/e-shell-window-actions.c:1242
 msgid "Save Custom View..."
 msgstr "Gardar a vista personalizada…"
 
-#: ../shell/e-shell-window-actions.c:1245
+#: ../shell/e-shell-window-actions.c:1244
 msgid "Save current custom view"
 msgstr "Gardar a vista personalizada actual"
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../shell/e-shell-window-actions.c:1251
 msgid "C_urrent View"
 msgstr "Vista act_ual"
 
-#: ../shell/e-shell-window-actions.c:1262
+#: ../shell/e-shell-window-actions.c:1261
 msgid "Custom View"
 msgstr "Vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1264
+#: ../shell/e-shell-window-actions.c:1263
 msgid "Current view is a customized view"
 msgstr "A vista actual é unha vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1272
+#: ../shell/e-shell-window-actions.c:1271
 msgid "Page Set_up..."
 msgstr "Config_uración de páxina…"
 
-#: ../shell/e-shell-window-actions.c:1274
+#: ../shell/e-shell-window-actions.c:1273
 msgid "Change the page settings for your current printer"
 msgstr "Cambiar os axustes da páxina para a impresora actual"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1634
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1757
 #, c-format
 msgid "Select view: %s"
 msgstr "Seleccionar vista: %s"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1774
 #, c-format
 msgid "Delete view: %s"
 msgstr "Eliminar vista: %s"
 
-#: ../shell/e-shell-window-actions.c:1869
+#: ../shell/e-shell-window-actions.c:1868
 msgid "Execute these search parameters"
 msgstr "Executar estes parámetros de busca"
 
@@ -23214,7 +23323,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:181
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -23250,7 +23359,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:205
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -23258,13 +23367,13 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:211
+#: ../shell/main.c:213
 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:300
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -23272,39 +23381,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:304
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometría indicada á xanela principal"
 
-#: ../shell/main.c:308
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:310
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "Ignorar a dispoñibilidade da rede"
 
-#: ../shell/main.c:313
+#: ../shell/main.c:315
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche do Evolution"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de todos os engadidos."
 
-#: ../shell/main.c:318
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de vista previa de correo, contactos e tarefas."
 
-#: ../shell/main.c:322
+#: ../shell/main.c:324
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Importar URI ou nomes de ficheiros fornecidos como argumentos."
 
-#: ../shell/main.c:324
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar a saída dun proceso de execución do Evolution"
 
-#: ../shell/main.c:401
+#: ../shell/main.c:403
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -23313,7 +23422,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:452 ../shell/main.c:457
+#: ../shell/main.c:454 ../shell/main.c:459
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de correo e XIP Evolution"
 
@@ -23373,6 +23482,60 @@ msgstr ""
 "Porén, como solución pode intentar anovar primeiro a Evolution 2 e despois a "
 "Evolution 3."
 
+#: ../shell/shell.error.xml.h:11
+msgid "Close Evolution with pending background operations?"
+msgstr "Desexa pechar Evolution coas operacións en segundo plano pendentes?"
+
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
+msgstr ""
+"Evolution está tardando moito en pecharse, posiblemente por problemas de "
+"conectividade de rede. Desexa cancelar todas as operacións pendentes e "
+"pechar inmediatamente, ou desexa agardar?"
+
+#: ../shell/shell.error.xml.h:13
+msgid "_Close Immediately"
+msgstr "_Pechar inmediatamente"
+
+#: ../shell/shell.error.xml.h:14
+msgid "Keep _Waiting"
+msgstr "Seguir _esperando"
+
+#: ../shell/shell.error.xml.h:15
+msgid "Failed to get values from '{0}'"
+msgstr "Produciuse un fallo ao obter os valores desde «{0}»"
+
+#: ../shell/shell.error.xml.h:16
+msgid "Failed to invoke authenticate for '{0}'"
+msgstr "Produciuse un fallo ao invocar a autenticación para «{0}»"
+
+#: ../shell/shell.error.xml.h:17
+msgid "Failed to connect to '{0}'"
+msgstr "Produciuse un fallo ao conectarse a «{0}»"
+
+#: ../shell/shell.error.xml.h:18
+msgid "_Reconnect"
+msgstr "_Reconectar"
+
+#: ../shell/shell.error.xml.h:19
+msgid "Failed to prompt for credentials for '{0}'"
+msgstr "Produciuse un fallo ao solicitar as credenciais para «{0}»"
+
+#: ../shell/shell.error.xml.h:20
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr "Produciuse un fallo ao rematar a solicitude de confianza para «{0}»"
+
+#: ../shell/shell.error.xml.h:21
+msgid "SSL certificate for '{0}' is not trusted."
+msgstr "O certificado SSL para «{0}» non é confiábel."
+
+#: ../shell/shell.error.xml.h:22
+msgid "Reason: {1}"
+msgstr "Razón: {1}"
+
 #: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
@@ -23384,174 +23547,281 @@ msgstr ""
 "\n"
 "Editar os axustes de confianza:"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Nome do certificado"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-msgid "Issued To Organization"
-msgstr "Expedido á organi_zación:"
-
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-msgid "Issued To Organizational Unit"
-msgstr "Expedido á unidade organizativa (OU)"
-
 #: ../smime/gui/certificate-manager.c:85
 #: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
-msgid "Serial Number"
-msgstr "Número de serie"
+msgid "Issued To Organization"
+msgstr "Expedido á organi_zación:"
 
 #: ../smime/gui/certificate-manager.c:86
 #: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
-msgid "Purposes"
-msgstr "Propósitos"
+msgid "Issued To Organizational Unit"
+msgstr "Expedido á unidade organizativa (OU)"
 
 #: ../smime/gui/certificate-manager.c:87
 #: ../smime/gui/certificate-manager.c:107
 #: ../smime/gui/certificate-manager.c:125
-msgid "Issued By"
-msgstr "Emitido por"
+msgid "Serial Number"
+msgstr "Número de serie"
 
 #: ../smime/gui/certificate-manager.c:88
 #: ../smime/gui/certificate-manager.c:108
 #: ../smime/gui/certificate-manager.c:126
-msgid "Issued By Organization"
-msgstr "Expedido pola organi_zación:"
+msgid "Purposes"
+msgstr "Propósitos"
 
 #: ../smime/gui/certificate-manager.c:89
 #: ../smime/gui/certificate-manager.c:109
 #: ../smime/gui/certificate-manager.c:127
-msgid "Issued By Organizational Unit"
-msgstr "Expedido pola unidade organizativa (UO)"
+msgid "Issued By"
+msgstr "Emitido por"
 
 #: ../smime/gui/certificate-manager.c:90
 #: ../smime/gui/certificate-manager.c:110
 #: ../smime/gui/certificate-manager.c:128
-msgid "Issued"
-msgstr "Emitido"
+msgid "Issued By Organization"
+msgstr "Expedido pola organi_zación:"
 
 #: ../smime/gui/certificate-manager.c:91
 #: ../smime/gui/certificate-manager.c:111
 #: ../smime/gui/certificate-manager.c:129
-msgid "Expires"
-msgstr "Caduca"
+msgid "Issued By Organizational Unit"
+msgstr "Expedido pola unidade organizativa (UO)"
 
 #: ../smime/gui/certificate-manager.c:92
 #: ../smime/gui/certificate-manager.c:112
 #: ../smime/gui/certificate-manager.c:130
-msgid "SHA1 Fingerprint"
-msgstr "Impresión dixital SHA1"
+msgid "Issued"
+msgstr "Emitido"
 
 #: ../smime/gui/certificate-manager.c:93
 #: ../smime/gui/certificate-manager.c:113
 #: ../smime/gui/certificate-manager.c:131
+msgid "Expires"
+msgstr "Caduca"
+
+#: ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:132
+msgid "SHA1 Fingerprint"
+msgstr "Impresión dixital SHA1"
+
+#: ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "Impresión dixital MD5"
 
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "Enderezo de correo"
 
-#: ../smime/gui/certificate-manager.c:637
+#: ../smime/gui/certificate-manager.c:650
 msgid "Select a file to backup your key and certificate..."
-msgstr ""
+msgstr "Seleccione un ficheiro para respaldar a súa chave e certificado…"
 
 #. To Translators:
 #. * %s-backup.p12 is the default file name suggested by the file selection dialog,
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:649
+#: ../smime/gui/certificate-manager.c:662
 #, c-format
 msgid "%s-backup.p12"
-msgstr ""
+msgstr "%s-backup.p12"
 
-#: ../smime/gui/certificate-manager.c:663
-#: ../smime/gui/certificate-manager.c:952
+#: ../smime/gui/certificate-manager.c:676
+#: ../smime/gui/certificate-manager.c:965
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../smime/gui/certificate-manager.c:715
-#, fuzzy
+#: ../smime/gui/certificate-manager.c:728
 msgid "Backup Certificate"
-msgstr "Certificado"
+msgstr "Respaldar certificado"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:729
-#, fuzzy
+#: ../smime/gui/certificate-manager.c:742
 msgid "_File name:"
 msgstr "Nome do _ficheiro:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:734
-#, fuzzy
+#: ../smime/gui/certificate-manager.c:747
 msgid "Please select a file..."
-msgstr "Seleccionar un cartafol"
+msgstr "Seleccione un ficheiro…"
 
-#: ../smime/gui/certificate-manager.c:748
+#: ../smime/gui/certificate-manager.c:761
 msgid "_Include certificate chain in the backup"
-msgstr ""
+msgstr "_Incluír a cadea de certificados no respaldo"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:754
+#: ../smime/gui/certificate-manager.c:767
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
 "You must set this password to proceed with the backup."
 msgstr ""
+"O contrasinal de respaldo do certificado que estabeleceu protexe o ficheiro "
+"de respaldo que está apunto de crear.\n"
+"Debe estabelecer este contrasinal para proceder co respaldo."
 
-#: ../smime/gui/certificate-manager.c:773
-#, fuzzy
+#: ../smime/gui/certificate-manager.c:786
 msgid "_Repeat Password:"
-msgstr "_Contrasinal:"
+msgstr "_Repetir o contrasinal:"
 
-#: ../smime/gui/certificate-manager.c:792
+#: ../smime/gui/certificate-manager.c:805
 msgid "Passwords do not match"
-msgstr ""
+msgstr "Os contrasinais non coinciden"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:800
+#: ../smime/gui/certificate-manager.c:813
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
 "restore this backup later.\n"
 "Please record it in a safe location."
 msgstr ""
+"Importante:\n"
+"Se desexa olvidar o seu contrasinal do respaldo do certificado, non poderá "
+"restaurar este respaldo máis tarde.\n"
+"Por favor gárdeo nun lugar seguro."
 
-#: ../smime/gui/certificate-manager.c:845
-#, fuzzy
+#: ../smime/gui/certificate-manager.c:858
 msgid "No file name provided"
-msgstr "Non se forneceu ningún enderezo de correo"
+msgstr "Non se forneceu un nome de ficheiro"
 
-#: ../smime/gui/certificate-manager.c:849
-#, fuzzy
+#: ../smime/gui/certificate-manager.c:862
 msgid "Failed to backup key and certificate"
-msgstr "Produciuse un erro ao importar o certificado"
+msgstr "Produciuse un erro ao respaldar a chave e o certificado"
 
-#: ../smime/gui/certificate-manager.c:938
+#: ../smime/gui/certificate-manager.c:951
 msgid "Select a certificate to import..."
 msgstr "Seleccionar un certificado para importar…"
 
-#: ../smime/gui/certificate-manager.c:988
+#: ../smime/gui/certificate-manager.c:1001
 msgid "Failed to import certificate"
 msgstr "Produciuse un erro ao importar o certificado"
 
-#: ../smime/gui/certificate-manager.c:1376
+#: ../smime/gui/certificate-manager.c:1117
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr "Preguntar ao usala"
+
+#: ../smime/gui/certificate-manager.c:1119
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "Nunca"
+
+#: ../smime/gui/certificate-manager.c:1121
+msgctxt "CamelTrust"
+msgid "Marginal"
+msgstr "Marginal"
+
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr "Completa"
+
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Ultimate"
+msgstr "Absoluta"
+
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Temporary"
+msgstr "Temporal"
+
+#: ../smime/gui/certificate-manager.c:1333
+msgid "Change certificate trust"
+msgstr "Cambiar confianza do certificado"
+
+#: ../smime/gui/certificate-manager.c:1345
+#, c-format
+msgid "Change trust for the host '%s':"
+msgstr "Cambiar confianza para este equipo «%s»:"
+
+#: ../smime/gui/certificate-manager.c:1369
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr "_Preguntar ao usalo"
+
+#: ../smime/gui/certificate-manager.c:1370
+msgctxt "CamelTrust"
+msgid "_Temporary (this session only)"
+msgstr "_Temporal (só para esta sesión)"
+
+#: ../smime/gui/certificate-manager.c:1371
+msgctxt "CamelTrust"
+msgid "_Never"
+msgstr "_Nunca"
+
+#: ../smime/gui/certificate-manager.c:1372
+msgctxt "CamelTrust"
+msgid "_Marginal"
+msgstr "_Marginal"
+
+#: ../smime/gui/certificate-manager.c:1373
+msgctxt "CamelTrust"
+msgid "_Fully"
+msgstr "_Completa"
+
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+msgid "_Ultimate"
+msgstr "_Absoluta"
+
+#: ../smime/gui/certificate-manager.c:1378
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+msgstr ""
+"Antes de confiar neste sitio, debería examinar o seu certificado e as súas "
+"directrices e procedementos (se están dispoñíbeis)."
+
+#: ../smime/gui/certificate-manager.c:1393
+msgid "_Display certificate"
+msgstr "_Mostrar certificado"
+
+#: ../smime/gui/certificate-manager.c:1598
+msgid "You have certificates on file that identify these mail servers:"
+msgstr ""
+"Ten os certificados no ficheiro que identifican estes servidores de correo:"
+
+#: ../smime/gui/certificate-manager.c:1629
+msgid "Host name"
+msgstr "Nome do equipo"
+
+#: ../smime/gui/certificate-manager.c:1631
+msgid "Issuer"
+msgstr "Emisor"
+
+#: ../smime/gui/certificate-manager.c:1632
+msgid "Fingerprint"
+msgstr "Pegada dixital"
+
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Trust"
+msgstr "Confiar"
+
+#: ../smime/gui/certificate-manager.c:1654
+msgid "_Edit Trust"
+msgstr "_Editar a confianza"
+
+#: ../smime/gui/certificate-manager.c:1973
 msgid "All PKCS12 files"
 msgstr "Todos os ficheiros PKCS12"
 
-#: ../smime/gui/certificate-manager.c:1393
+#: ../smime/gui/certificate-manager.c:1990
 msgid "All email certificate files"
 msgstr "Todos os ficheiros de certificados de correo"
 
-#: ../smime/gui/certificate-manager.c:1410
+#: ../smime/gui/certificate-manager.c:2007
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros de certificados dunha EA"
 
@@ -23695,7 +23965,7 @@ msgstr "Sinatura"
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: ../smime/lib/e-cert-db.c:782
+#: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
 msgstr "O certificado xa existe"
 
@@ -23708,29 +23978,30 @@ msgid "Enter password for PKCS12 file:"
 msgstr "Introduza un contrasinal para o ficheiro PKCS12:"
 
 #: ../smime/lib/e-pkcs12.c:329
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create export context, err_code: %i"
-msgstr "Non foi posíbel reservar un recurso, erro: %s"
+msgstr "Non foi posíbel exportar o contexto, err_code: %i"
 
 #: ../smime/lib/e-pkcs12.c:336
 #, c-format
 msgid "Unable to setup password integrity, err_code: %i"
-msgstr ""
+msgstr "Non é posíbel configurar a integridade do contrasinal, err_code: %i"
 
 #: ../smime/lib/e-pkcs12.c:346
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create safe bag, err_code: %i"
-msgstr "Non é posíbel crear os cartafoles de correo local en «%s»: %s"
+msgstr "Non é posíbel crear a bolsa de seguranza, err_code: %i"
 
 #: ../smime/lib/e-pkcs12.c:364
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add key/cert to the store, err_code: %i"
-msgstr "Non foi posíbel reservar un recurso, erro: %s"
+msgstr ""
+"Non foi posíbel engadir a chave/certificado no almacenamento, err_code: %i"
 
 #: ../smime/lib/e-pkcs12.c:382
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to write store to disk, err_code: %i"
-msgstr "Non foi posíbel reservar un recurso, erro: %s"
+msgstr "Non é posíbel escribir o almacenamento no disco, err_code: %i"
 
 #: ../smime/lib/e-pkcs12.c:409
 msgid "Imported Certificate"
@@ -23808,6 +24079,13 @@ msgstr "Con _data de vencemento"
 msgid "With _Status"
 msgstr "Con e_stado"
 
+#, fuzzy
+#~ msgid "Selection a file"
+#~ msgstr "Seleccionar un ficheiro"
+
+#~ msgid "Invalid authentication result code (%d)"
+#~ msgstr "Código de resposta (%d) de autenticación non válido"
+
 #~ msgid "Web addresses"
 #~ msgstr "Enderezos web"
 
@@ -24000,9 +24278,6 @@ msgstr "Con e_stado"
 #~ msgid "Expires On"
 #~ msgstr "Caduca o"
 
-#~ msgid "Fingerprints"
-#~ msgstr "Impresións dixitais"
-
 #~ msgid "Certificate Hierarchy"
 #~ msgstr "Xerarquía do certificado"
 
@@ -24123,9 +24398,6 @@ msgstr "Con e_stado"
 #~ msgid "Certificate Signature Algorithm"
 #~ msgstr "Algoritmo de sinatura do certificado"
 
-#~ msgid "Issuer"
-#~ msgstr "Emisor"
-
 #~ msgid "Issuer Unique ID"
 #~ msgstr "ID único do emisor"
 
@@ -24963,9 +25235,6 @@ msgstr "Con e_stado"
 #~ msgid "Settings"
 #~ msgstr "Axustes"
 
-#~ msgid "Cannot get transport for account '%s'"
-#~ msgstr "Non é posíbel obter o servizo de transporte para a conta «%s»"
-
 #~ msgid "Please check your account settings and try again."
 #~ msgstr "Comprobe os axustes da conta e ténteo outra vez."
 
@@ -25089,11 +25358,6 @@ msgstr "Con e_stado"
 #~ msgid "Enable local folders"
 #~ msgstr "Activar cartafoles locais"
 
-#~ msgid "Whether to show local folders (On This Computer) in a folder tree."
-#~ msgstr ""
-#~ "Indica se se deben mostrar os cartafoles locais (Neste equipo) nun árbore "
-#~ "de cartafoles."
-
 #~ msgid "Display only message texts not exceeding certain size"
 #~ msgstr "Mostrar só as mensaxes de texto que non excedan de certo tamaño"
 
@@ -25954,9 +26218,6 @@ msgstr "Con e_stado"
 #~ msgid "You are acting on behalf of %s"
 #~ msgstr "Está actuando no nome de %s"
 
-#~ msgid "On This Computer"
-#~ msgstr "Neste computador"
-
 #~ msgid "List of selected calendars"
 #~ msgstr "Lista dos calendarios seleccionados"
 
@@ -26053,9 +26314,6 @@ msgstr "Con e_stado"
 #~ msgid "Drafts _Folder:"
 #~ msgstr "Carta_fol dos borradores:"
 
-#~ msgid "_Trash Folder:"
-#~ msgstr "Cartafo_l do lixo:"
-
 #~ msgid "_Junk Folder:"
 #~ msgstr "Cartafol do coreo _lixo:"
 
@@ -26707,9 +26965,6 @@ msgstr "Con e_stado"
 #~ msgid "Header Value Contains:"
 #~ msgstr "O valor da cabeceira contén:"
 
-#~ msgid "I_nclude threads"
-#~ msgstr "I_ncluír fíos"
-
 #~ msgid "_Group:"
 #~ msgstr "_Grupo:"
 
@@ -26955,9 +27210,6 @@ msgstr "Con e_stado"
 #~ msgid "_Default junk plugin:"
 #~ msgstr "Engadi_do predeterminado para o correo lixo:"
 
-#~ msgid "Scanning folders in '%s'"
-#~ msgstr "Examinando os cartafoles de «%s»"
-
 #~ msgid "Retrieving quota information for folder '%s'"
 #~ msgstr "Obtendo a información da cota do cartafol «%s»"
 


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