[evolution] Updated galician translations

From: Francisco Diéguez Souto <frandieguez src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Updated galician translations
Date: Sat, 30 Apr 2011 21:42:16 +0000 (UTC)
commit 203709e14179e36ff277894e2a6165223db232ac
Author: Fran DiÃ©guez <fran dieguez mabishu com>
Date:   Sat Apr 30 23:42:04 2011 +0200

    Updated galician translations

 po/gl.po | 2586 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1317 insertions(+), 1269 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index f74f746..b25554a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -18,13 +18,13 @@
 # Fran Dieguez <frandieguez ubuntu com>, 2010.
 # Fran DiÃ©guez <frandieguez gnome org>, 2009, 2010, 2011.
 #
-#: ../shell/main.c:615
+#: ../shell/main.c:627
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 15:31+0100\n"
-"PO-Revision-Date: 2011-03-15 15:33+0100\n"
+"POT-Creation-Date: 2011-04-30 23:31+0200\n"
+"PO-Revision-Date: 2011-04-30 23:41+0200\n"
 "Last-Translator: Fran DiÃ©guez <frandieguez gnome org>\n"
 "Language-Team: Galician <gnome-l10n-gl gnome org>\n"
 "Language: gl\n"
@@ -103,7 +103,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Desexa eliminar a axenda de enderezos Â«{0}Â»?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "_Non eliminar"
 
@@ -267,8 +267,8 @@ msgstr "Aniversario"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:116
-#: ../shell/main.c:133
+#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:77
+#: ../shell/main.c:134
 msgid "Birthday"
 msgstr "Aniversario"
 
@@ -333,7 +333,7 @@ msgstr "Imaxe"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
-msgstr "MensaxerÃa instantÃ¡nea"
+msgstr "MensaxarÃa instantÃ¡nea"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
@@ -353,7 +353,7 @@ msgid "Nic_kname:"
 msgstr "_Alcume:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:260
+#: ../modules/calendar/e-memo-shell-migrate.c:261
 #: ../plugins/groupwise-features/camel-gw-listener.c:429
 #: ../plugins/groupwise-features/camel-gw-listener.c:454
 #: ../plugins/groupwise-features/camel-gw-listener.c:570
@@ -416,7 +416,7 @@ msgid "_Blog:"
 msgstr "_blogue:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:707
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
@@ -694,7 +694,7 @@ msgid "_List name:"
 msgstr "Nome da _lista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:164
 msgid "_Select..."
 msgstr "_Seleccionarâ?¦"
 
@@ -780,20 +780,20 @@ msgstr "Combinar o contacto"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1693
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/calendar/e-cal-shell-view-actions.c:1682
 #: ../modules/calendar/e-memo-shell-view-actions.c:774
 #: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Any field contains"
 msgstr "Calquera campo contÃ©n"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Email begins with"
 msgstr "O correo comeza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:922
 msgid "Name contains"
 msgstr "O nome contÃ©n"
 
@@ -808,11 +808,11 @@ msgid_plural "%d contacts"
 msgstr[0] "%d contacto"
 msgstr[1] "%d contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:342
+#: ../addressbook/gui/widgets/e-addressbook-model.c:341
 msgid "Error getting book view"
 msgstr "Produciuse un erro ao visualizar a axenda"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:756
+#: ../addressbook/gui/widgets/e-addressbook-model.c:755
 msgid "Search Interrupted"
 msgstr "Busca interrumpida"
 
@@ -833,7 +833,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Pegar os contactos desde o portapapeis"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
 msgid "Delete selected contacts"
 msgstr "Eliminar os contactos seleccionados"
 
@@ -1171,17 +1171,17 @@ msgid "Copy _Email Address"
 msgstr "Copiar o _enderezo de correo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../widgets/misc/e-web-view.c:397
+#: ../widgets/misc/e-web-view.c:404
 msgid "Copy the email address to the clipboard"
 msgstr "Copiar o enderezo de correo ao portapapeis"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:179
-#: ../widgets/misc/e-web-view.c:402
+#: ../widgets/misc/e-web-view.c:409
 msgid "_Send New Message To..."
 msgstr "Enviar unha men_saxe nova aâ?¦"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:404
+#: ../widgets/misc/e-web-view.c:411
 msgid "Send a mail message to this address"
 msgstr "Enviar unha mensaxe a este enderezo"
 
@@ -1254,13 +1254,13 @@ msgstr "Diario web"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../capplet/settings/mail-capplet-shell.c:361
+#: ../capplet/settings/mail-capplet-shell.c:345
 #: ../modules/addressbook/e-book-shell-backend.c:112
 #: ../modules/addressbook/e-book-shell-migrate.c:143
 #: ../modules/calendar/e-cal-shell-backend.c:128
 #: ../modules/calendar/e-cal-shell-migrate.c:161
 #: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:117
+#: ../modules/calendar/e-memo-shell-migrate.c:116
 #: ../modules/calendar/e-task-shell-backend.c:112
 #: ../modules/calendar/e-task-shell-migrate.c:128
 msgid "Personal"
@@ -1279,7 +1279,7 @@ msgid "Blog"
 msgstr "Blogue"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1055
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:890
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
@@ -1954,8 +1954,8 @@ msgstr "_Enviar"
 msgid "_Send Notice"
 msgstr "_Enviar a notificaciÃ³n"
 
-#: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1776
+#: ../calendar/common/authentication.c:75
+#: ../calendar/gui/e-meeting-store.c:1823
 #: ../plugins/caldav/caldav-browse-server.c:921
 #: ../plugins/google-account-setup/google-source.c:439
 #: ../plugins/publish-calendar/publish-calendar.c:332
@@ -2013,7 +2013,7 @@ msgstr "LocalizaciÃ³n:"
 msgid "Snooze _time:"
 msgstr "Tempo antes da repeticiÃ³n:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:896
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:910
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Ignorar"
@@ -2181,7 +2181,7 @@ msgid "Classification"
 msgstr "ClasificaciÃ³n"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/e-cal-model.c:773 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
@@ -2223,13 +2223,13 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:770 ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-task-table.c:493
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:761 ../calendar/gui/e-cal-model.c:768
+#: ../calendar/gui/e-cal-model.c:762 ../calendar/gui/e-cal-model.c:769
 #: ../calendar/gui/e-task-table.c:492 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃºblico"
@@ -2320,7 +2320,7 @@ msgstr "Son de alarma personalizado"
 msgid "Mes_sage:"
 msgstr "Mensa_xe:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "OpciÃ³ns"
 
@@ -2408,7 +2408,7 @@ msgstr "Tipo:"
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:152
+#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:156
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
@@ -2440,10 +2440,10 @@ msgstr "Co_r:"
 #: ../calendar/gui/dialogs/calendar-setup.c:375
 #: ../calendar/gui/dialogs/calendar-setup.c:386
 #: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:52
 #: ../modules/addressbook/addressbook-config.c:1010
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../plugins/itip-formatter/itip-formatter.c:2819
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -2530,7 +2530,7 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non realizou modificaciÃ³ns. Desexa actualizar o editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:445
+#: ../calendar/gui/dialogs/comp-editor-page.c:458
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erro de validaciÃ³n: %s"
@@ -2584,17 +2584,17 @@ msgstr "Desexa gardar o elemento orixinal?"
 msgid "Click here to close the current window"
 msgstr "Prema aquÃ para pechar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:132
+#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:133
 #: ../shell/e-shell-window-actions.c:1433
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:552
-#: ../widgets/misc/e-web-view.c:414 ../widgets/misc/e-web-view.c:1068
+#: ../widgets/misc/e-web-view.c:421 ../widgets/misc/e-web-view.c:1209
 msgid "Copy the selection"
 msgstr "Copiar a selecciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:139
+#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:140
 #: ../shell/e-shell-window-actions.c:1440
 #: ../widgets/misc/e-focus-tracker.c:107 ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1062
+#: ../widgets/misc/e-web-view.c:1203
 msgid "Cut the selection"
 msgstr "Cortar a selecciÃ³n"
 
@@ -2608,10 +2608,10 @@ msgstr "Eliminar a selecciÃ³n"
 msgid "Click here to view help available"
 msgstr "Prema aquÃ para ver a axuda dispoÃ±Ãbel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1040 ../mail/e-mail-browser.c:146
+#: ../calendar/gui/dialogs/comp-editor.c:1040 ../mail/e-mail-browser.c:147
 #: ../shell/e-shell-window-actions.c:1482
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1074
+#: ../widgets/misc/e-web-view.c:1215
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
@@ -2619,7 +2619,7 @@ msgstr "Pegar o contido do portapapeis"
 msgid "Click here to save the current window"
 msgstr "Prema aquÃ para gardar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068 ../mail/e-mail-browser.c:153
+#: ../calendar/gui/dialogs/comp-editor.c:1068 ../mail/e-mail-browser.c:154
 #: ../shell/e-shell-window-actions.c:1552
 #: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
@@ -2631,14 +2631,14 @@ msgstr "_ClasificaciÃ³n"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1082
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:167
+#: ../mail/e-mail-browser.c:168
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1580
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089 ../mail/e-mail-browser.c:160
+#: ../calendar/gui/dialogs/comp-editor.c:1089 ../mail/e-mail-browser.c:161
 #: ../shell/e-shell-window-actions.c:1587
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
@@ -2658,7 +2658,7 @@ msgstr "_Inserir"
 msgid "_Options"
 msgstr "_OpciÃ³ns"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117 ../mail/e-mail-browser.c:174
+#: ../calendar/gui/dialogs/comp-editor.c:1117 ../mail/e-mail-browser.c:175
 #: ../shell/e-shell-window-actions.c:1629 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "__VisualizaciÃ³n"
@@ -2900,7 +2900,7 @@ msgid "Send Options"
 msgstr "OpciÃ³ns de envÃo"
 
 #: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "Inserir opciÃ³ns avanzadas de envÃo"
 
@@ -2934,85 +2934,79 @@ msgstr "Participantes"
 msgid "Print this event"
 msgstr "Imprimir esta actividade"
 
-#: ../calendar/gui/dialogs/event-page.c:765
+#: ../calendar/gui/dialogs/event-page.c:554
 msgid "Event's start time is in the past"
 msgstr "A hora de inicio da actividade xa pasou"
 
-#: ../calendar/gui/dialogs/event-page.c:806
+#: ../calendar/gui/dialogs/event-page.c:632
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Non Ã© posÃbel editar a actividade porque o calendario seleccionado Ã© de sÃ³ "
 "lectura"
 
-#: ../calendar/gui/dialogs/event-page.c:810
+#: ../calendar/gui/dialogs/event-page.c:636
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Non Ã© posÃbel editar a actividade totalmente porque vostede non Ã© o "
 "organizador"
 
-#: ../calendar/gui/dialogs/event-page.c:822
-#: ../calendar/gui/dialogs/event-page.c:2780
+#: ../calendar/gui/dialogs/event-page.c:648
+#: ../calendar/gui/dialogs/event-page.c:2869
 msgid "This event has alarms"
 msgstr "Esta actividade ten alarmas"
 
-#: ../calendar/gui/dialogs/event-page.c:889
+#: ../calendar/gui/dialogs/event-page.c:715
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:936
-msgid "_Delegatees"
-msgstr "_Delegados"
-
-#: ../calendar/gui/dialogs/event-page.c:938
-msgid "Atte_ndees"
-msgstr "_Participantes"
-
-#: ../calendar/gui/dialogs/event-page.c:1155
+#: ../calendar/gui/dialogs/event-page.c:1113
 msgid "Event with no start date"
 msgstr "Actividade sen data de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1158
+#: ../calendar/gui/dialogs/event-page.c:1116
 msgid "Event with no end date"
 msgstr "Actividade sen data de finalizaciÃ³n"
 
-#: ../calendar/gui/dialogs/event-page.c:1329
-#: ../calendar/gui/dialogs/memo-page.c:671
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1287
+#: ../calendar/gui/dialogs/memo-page.c:692
+#: ../calendar/gui/dialogs/task-page.c:845
 msgid "Start date is wrong"
 msgstr "A data de inicio Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1339
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End date is wrong"
 msgstr "A data de finalizaciÃ³n Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1362
+#: ../calendar/gui/dialogs/event-page.c:1320
 msgid "Start time is wrong"
 msgstr "A hora de inicio Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1369
+#: ../calendar/gui/dialogs/event-page.c:1327
 msgid "End time is wrong"
 msgstr "A hora de finalizaciÃ³n Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/memo-page.c:712
-#: ../calendar/gui/dialogs/task-page.c:967
-msgid "The organizer selected no longer has an account."
-msgstr "O organizador seleccionado xa non ten unha conta."
-
-#: ../calendar/gui/dialogs/event-page.c:1539
-#: ../calendar/gui/dialogs/memo-page.c:718
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1491
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "An organizer is required."
 msgstr "RequÃrese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1564
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1525
+#: ../calendar/gui/dialogs/task-page.c:941
 msgid "At least one attendee is required."
 msgstr "RequÃrese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:2654
+#: ../calendar/gui/dialogs/event-page.c:1724
+msgid "_Delegatees"
+msgstr "_Delegados"
+
+#: ../calendar/gui/dialogs/event-page.c:1726
+msgid "Atte_ndees"
+msgstr "_Participantes"
+
+#: ../calendar/gui/dialogs/event-page.c:2743
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Non foi posÃbel abrir o calendario Â«%sÂ»."
@@ -3023,40 +3017,40 @@ msgstr "Non foi posÃbel abrir o calendario Â«%sÂ»."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2698
-#: ../calendar/gui/dialogs/memo-page.c:931
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/event-page.c:2787
+#: ../calendar/gui/dialogs/memo-page.c:956
+#: ../calendar/gui/dialogs/task-page.c:1849
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "EstÃ¡ actuando no nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3009
+#: ../calendar/gui/dialogs/event-page.c:3098
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dÃa antes da cita"
 msgstr[1] "%d dÃas antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3015
+#: ../calendar/gui/dialogs/event-page.c:3104
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes da cita"
 msgstr[1] "%d horas antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3110
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes da cita"
 msgstr[1] "%d minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3040
+#: ../calendar/gui/dialogs/event-page.c:3129
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3046
+#: ../calendar/gui/dialogs/event-page.c:3135
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ningunha"
@@ -3142,30 +3136,30 @@ msgstr "Nota"
 msgid "Print this memo"
 msgstr "Imprimir esta nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:337
+#: ../calendar/gui/dialogs/memo-page.c:387
 msgid "Memo's start date is in the past"
 msgstr "A hora de inicio da nota xa pasou"
 
-#: ../calendar/gui/dialogs/memo-page.c:375
+#: ../calendar/gui/dialogs/memo-page.c:425
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "Non Ã© posÃbel editar a nota porque a lista de notas solicitada Ã© de sÃ³ "
 "lectura"
 
-#: ../calendar/gui/dialogs/memo-page.c:379
+#: ../calendar/gui/dialogs/memo-page.c:429
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Non Ã© posÃbel editar a nota na sÃºa totalidade porque vostede non Ã© o "
 "organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:892
+#: ../calendar/gui/dialogs/memo-page.c:917
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Non Ã© posÃbel abrir as notas en Â«%sÂ»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1063 ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2396
-#: ../mail/em-format-html.c:2461 ../mail/em-format-html.c:2485
+#: ../calendar/gui/dialogs/memo-page.c:1088 ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1053 ../mail/em-format-html.c:2479
+#: ../mail/em-format-html.c:2544 ../mail/em-format-html.c:2568
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "Para"
@@ -3185,7 +3179,7 @@ msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:422
+#: ../calendar/gui/dialogs/task-page.c:332
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
@@ -3405,7 +3399,7 @@ msgstr "Cada"
 msgid "Exceptions"
 msgstr "ExcepciÃ³ns"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
 msgstr "PrevisualizaciÃ³n"
 
@@ -3489,7 +3483,7 @@ msgstr "Cancelada"
 #: ../calendar/gui/e-cal-component-preview.c:291
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
 #: ../calendar/gui/e-task-table.c:595 ../calendar/gui/print.c:3259
 #: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
@@ -3500,7 +3494,7 @@ msgstr "Completada"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:313
 #: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1228 ../widgets/misc/e-send-options.ui.h:13
+#: ../mail/message-list.c:1227 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Alta"
 
@@ -3519,15 +3513,15 @@ msgstr "En progreso"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:317
 #: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:14
+#: ../mail/message-list.c:1225 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Baixa"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model.c:1521 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1227
+#: ../calendar/gui/e-cal-model.c:1522 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1226
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
@@ -3582,62 +3576,62 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "PÃ¡xina _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "InformaciÃ³n do e_stado"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "Prema para cambiar ou ver a informaciÃ³n do estado da tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:126
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "OpciÃ³n_s de envÃo"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:3174
+#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3174
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "Task Details"
 msgstr "InformaciÃ³n da tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:364
 msgid "Print this task"
 msgstr "Imprimir esta tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:249
 msgid "Task's start date is in the past"
 msgstr "A data de inicio da tarefa xa pasou"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's due date is in the past"
 msgstr "A data de vencemento da tarefa xa pasou"
 
-#: ../calendar/gui/dialogs/task-page.c:375
+#: ../calendar/gui/dialogs/task-page.c:285
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Non Ã© posÃbel editar a tarefa porque a lista de tarefas seleccionada Ã© de sÃ³ "
 "lectura"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:289
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Non Ã© posÃbel editar a tarefa na sÃºa totalidade porque vostede non Ã© o "
 "organizador"
 
-#: ../calendar/gui/dialogs/task-page.c:430
+#: ../calendar/gui/dialogs/task-page.c:340
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:818
 msgid "Due date is wrong"
 msgstr "A data de vencemento Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non Ã© posÃbel abrir as tarefas en Â«%sÂ»."
@@ -3761,7 +3755,7 @@ msgstr "Estado:"
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:336 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "DescriciÃ³n:"
 
@@ -3817,39 +3811,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1528
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1027
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1528
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:775 ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1092
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1092
 #: ../calendar/gui/print.c:1109 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2485
+#: ../plugins/itip-formatter/itip-formatter.c:458
+#: ../plugins/itip-formatter/itip-formatter.c:2486
 msgid "Unknown"
 msgstr "DescoÃ±ecido"
 
-#: ../calendar/gui/e-cal-model.c:1523
+#: ../calendar/gui/e-cal-model.c:1524
 msgid "Recurring"
 msgstr "RepeticiÃ³n"
 
-#: ../calendar/gui/e-cal-model.c:1525
+#: ../calendar/gui/e-cal-model.c:1526
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-model.c:2643
+#: ../calendar/gui/e-cal-model.c:2644
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
@@ -3921,29 +3915,29 @@ msgstr "Actualizando os obxectos"
 
 #: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../plugins/itip-formatter/itip-formatter.c:2473
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2474
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../plugins/itip-formatter/itip-formatter.c:2479
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2480
 msgid "Declined"
 msgstr "Rexeitado"
 
 #: ../calendar/gui/e-calendar-view.c:1780
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
 #: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Tentative"
 msgstr "Provisional"
 
 #: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2483
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -4099,56 +4093,56 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:1022 ../calendar/gui/print.c:1088
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
 #: ../calendar/gui/print.c:1089 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
 #: ../calendar/gui/print.c:1090
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
 #: ../calendar/gui/print.c:1091
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
 #: ../calendar/gui/print.c:1105
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1024 ../calendar/gui/print.c:1106
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:1025 ../calendar/gui/print.c:1106
 msgid "Required Participant"
 msgstr "Participante necesario"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
 #: ../calendar/gui/print.c:1107
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/print.c:1108
 msgid "Non-Participant"
 msgstr "Non-participante"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1034
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1035
 msgid "Needs Action"
 msgstr "Necesita unha acciÃ³n"
 
@@ -4163,18 +4157,18 @@ msgstr "Participante                          "
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "En progreso"
 
-#: ../calendar/gui/e-meeting-store.c:1763
+#: ../calendar/gui/e-meeting-store.c:1810
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Introducir o contrasinal para acceder Ã¡ informaciÃ³n de dispoÃ±ibilidade no "
 "servidor %s como usuario %s"
 
-#: ../calendar/gui/e-meeting-store.c:1772
+#: ../calendar/gui/e-meeting-store.c:1819
 #, c-format
 msgid "Failure reason: %s"
 msgstr "RazÃ³n do fallo: %s"
@@ -4598,32 +4592,32 @@ msgstr "Seleccionar o dÃa de _hoxe"
 msgid "September"
 msgstr "Setembro"
 
-#: ../calendar/gui/itip-utils.c:422 ../calendar/gui/itip-utils.c:477
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:504 ../calendar/gui/itip-utils.c:559
+#: ../calendar/gui/itip-utils.c:655
 msgid "An organizer must be set."
 msgstr "Debe estabelecerse un organizador."
 
-#: ../calendar/gui/itip-utils.c:469
+#: ../calendar/gui/itip-utils.c:551
 msgid "At least one attendee is necessary"
 msgstr "Ã? necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:740 ../calendar/gui/itip-utils.c:901
 msgid "Event information"
 msgstr "InformaciÃ³n da actividade"
 
-#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:743 ../calendar/gui/itip-utils.c:904
 msgid "Task information"
 msgstr "InformaciÃ³n da tarefa"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:746 ../calendar/gui/itip-utils.c:907
 msgid "Memo information"
 msgstr "InformaciÃ³n da nota"
 
-#: ../calendar/gui/itip-utils.c:666 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:749 ../calendar/gui/itip-utils.c:925
 msgid "Free/Busy information"
 msgstr "InformaciÃ³n de dispoÃ±ibilidade"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:752
 msgid "Calendar information"
 msgstr "InformaciÃ³n do calendario"
 
@@ -4631,7 +4625,7 @@ msgstr "InformaciÃ³n do calendario"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:789
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -4640,7 +4634,7 @@ msgstr "Aceptado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:796
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -4652,7 +4646,7 @@ msgstr "Aceptado provisionalmente"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720 ../calendar/gui/itip-utils.c:768
+#: ../calendar/gui/itip-utils.c:803 ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rexeitado"
@@ -4661,7 +4655,7 @@ msgstr "Rexeitado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:810
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -4669,7 +4663,7 @@ msgstr "Delegado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:823
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -4677,7 +4671,7 @@ msgstr "Actualizado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:830
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -4685,7 +4679,7 @@ msgstr "Cancelar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -4693,31 +4687,31 @@ msgstr "Actualizar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:922
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "InformaciÃ³n de dispoÃ±ibilidade (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:930
 msgid "iCalendar information"
 msgstr "InformaciÃ³n de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:865
+#: ../calendar/gui/itip-utils.c:955
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Non foi posÃbel reservar un recurso, a nova actividade colisiona con algunha "
 "outra."
 
-#: ../calendar/gui/itip-utils.c:869
+#: ../calendar/gui/itip-utils.c:959
 msgid "Unable to book a resource, error: "
 msgstr "Non foi posÃbel reservar un recurso, erro:"
 
-#: ../calendar/gui/itip-utils.c:1032
+#: ../calendar/gui/itip-utils.c:1120
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante na actividade."
 
@@ -4845,6 +4839,7 @@ msgstr "30"
 msgid "31st"
 msgstr "31"
 
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
 #: ../calendar/gui/print.c:612
 msgid "Su"
 msgstr "Do"
@@ -4873,22 +4868,34 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "SÃ¡"
 
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
 #: ../calendar/gui/print.c:3001
 msgid " to "
 msgstr " para "
 
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
 #: ../calendar/gui/print.c:3011
 msgid " (Completed "
 msgstr " (Completado "
 
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
 #: ../calendar/gui/print.c:3017
 msgid "Completed "
 msgstr "Completado "
 
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
 #: ../calendar/gui/print.c:3027
 msgid " (Due "
 msgstr " (Vencemento "
 
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
 #: ../calendar/gui/print.c:3034
 msgid "Due "
 msgstr "Vencemento "
@@ -4954,7 +4961,7 @@ msgstr "Citas e reuniÃ³ns"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1958
+#: ../plugins/itip-formatter/itip-formatter.c:1959
 msgid "Opening calendar"
 msgstr "Abrindo o calendario"
 
@@ -6931,17 +6938,17 @@ msgstr ""
 "Non Ã© posÃbel cifrar a mensaxe saÃnte: non hai un certificado de cifrado "
 "estabelecido para esta conta"
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2058
+#: ../composer/e-msg-composer.c:1680 ../composer/e-msg-composer.c:2063
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4116
+#: ../composer/e-msg-composer.c:4121
 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 a "
 "ediciÃ³n."
 
-#: ../composer/e-msg-composer.c:4821
+#: ../composer/e-msg-composer.c:4826
 msgid "Untitled Message"
 msgstr "Mensaxe sen tÃtulo"
 
@@ -7103,27 +7110,15 @@ msgstr "Gardar na caixa de _saÃda"
 msgid "_Try Again"
 msgstr "Tentar outra vez"
 
-#: ../capplet/anjal-settings-main.c:216
-msgid "Run Anjal in a window"
-msgstr "Executar Anjar nunha xanela"
-
-#: ../capplet/anjal-settings-main.c:217
-msgid "Make Anjal the default email client"
-msgstr "Facer do Anjal o cliente de correo electrÃ³nico predeterminado"
-
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:151
 msgid "ID of the socket to embed in"
 msgstr "ID do socket para encaixar"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:152
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:238
-msgid "Anjal email client"
-msgstr "Cliente de correo Anjal"
-
 #: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "Introduza o seu nome completo."
@@ -7243,7 +7238,7 @@ msgstr ""
 "o seu correo electrÃ³nico"
 
 #: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2090 ../mail/em-account-editor.c:2211
+#: ../mail/em-account-editor.c:2170 ../mail/em-account-editor.c:2291
 msgid "Identity"
 msgstr "Identidade"
 
@@ -7295,7 +7290,7 @@ msgid "Back - Receiving options"
 msgstr "Anterior - OpciÃ³ns de recepciÃ³n"
 
 #: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3042
+#: ../mail/em-account-editor.c:3122
 msgid "Defaults"
 msgstr "PredefiniciÃ³ns"
 
@@ -7365,23 +7360,23 @@ msgstr "Pechar a lapela"
 msgid "Account Wizard"
 msgstr "Asistente da conta"
 
-#: ../capplet/settings/mail-capplet-shell.c:209
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Asistente de contas do Evolution"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:353 ../mail/e-mail-migrate.c:680
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:146
+#: ../capplet/settings/mail-capplet-shell.c:337 ../mail/e-mail-migrate.c:694
+#: ../mail/e-mail-store.c:230 ../mail/em-folder-tree-model.c:146
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
 #: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1721
+#: ../mail/message-list.c:1720
 #: ../modules/addressbook/e-book-shell-backend.c:92
 #: ../modules/addressbook/e-book-shell-migrate.c:135
 #: ../modules/calendar/e-cal-shell-backend.c:103
 #: ../modules/calendar/e-cal-shell-migrate.c:150
 #: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:106
+#: ../modules/calendar/e-memo-shell-migrate.c:105
 #: ../modules/calendar/e-task-shell-backend.c:92
 #: ../modules/calendar/e-task-shell-migrate.c:117
 msgid "On This Computer"
@@ -7412,7 +7407,7 @@ msgstr "NotificaciÃ³ns de actividades do calendario"
 msgid "Evolution Alarm Notify"
 msgstr "Notificador de alarmas do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:952
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:957
 #: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
@@ -7552,7 +7547,7 @@ msgstr "Visual"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1811
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:308
 msgid "Today"
@@ -7698,11 +7693,11 @@ msgstr "O ficheiro xa existe Â«{0}Â»."
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:141
 msgid "Could not open the link."
 msgstr "Non foi posÃbel abrir a ligazÃ³n."
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:188
 msgid "Could not display help for Evolution."
 msgstr "Non foi posÃbel mostrar a axuda do Evolution."
 
@@ -7715,30 +7710,30 @@ msgstr "Erro do GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Todos os erros posteriores mostraranse sÃ³ no terminal."
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
 #: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:70
 msgid "From"
 msgstr "De"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1052
 #: ../modules/mail/em-mailer-prefs.c:71
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2397 ../mail/em-format-html.c:2465
-#: ../mail/em-format-html.c:2488 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2480 ../mail/em-format-html.c:2548
+#: ../mail/em-format-html.c:2571 ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2398 ../mail/em-format-html.c:2469
-#: ../mail/em-format-html.c:2491 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1055
+#: ../mail/em-format-html.c:2481 ../mail/em-format-html.c:2552
+#: ../mail/em-format-html.c:2574 ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "Cco"
 
-#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1055
+#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1056
 #: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
 #: ../plugins/groupwise-features/notification.ui.h:2
@@ -7747,8 +7742,8 @@ msgid "Subject"
 msgstr "Titular"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2585
-#: ../modules/mail/em-mailer-prefs.c:1119
+#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2668
+#: ../modules/mail/em-mailer-prefs.c:1124
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
@@ -7756,65 +7751,65 @@ msgstr "Aplicativo de correo"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reencamiÃ±ada --------"
 
-#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
+#: ../em-format/em-format.c:1057 ../mail/message-list.etspec.h:2
 #: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:77
 msgid "Newsgroups"
 msgstr "Grupos de discusiÃ³n"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1059 ../modules/mail/em-mailer-prefs.c:78
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Cara"
 
-#: ../em-format/em-format.c:1455
+#: ../em-format/em-format.c:1456
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: ../em-format/em-format.c:1566
+#: ../em-format/em-format.c:1567
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Non foi posÃbel analizar a mensaxe S/MIME: erro descoÃ±ecido"
 
-#: ../em-format/em-format.c:1748 ../em-format/em-format.c:1942
+#: ../em-format/em-format.c:1749 ../em-format/em-format.c:1943
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non foi posÃbel analizar a mensaxe MIME. MostrÃ¡ndoa como fonte."
 
-#: ../em-format/em-format.c:1758
+#: ../em-format/em-format.c:1759
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado non compatÃbel para multipart/encrypted"
 
-#: ../em-format/em-format.c:1778
+#: ../em-format/em-format.c:1779
 msgid "Could not parse PGP/MIME message"
 msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME"
 
-#: ../em-format/em-format.c:1779
+#: ../em-format/em-format.c:1780
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME: erro descoÃ±ecido"
 
-#: ../em-format/em-format.c:1967
+#: ../em-format/em-format.c:1968
 msgid "Unsupported signature format"
 msgstr "O formato da sinatura non Ã© compatÃbel"
 
-#: ../em-format/em-format.c:1980 ../em-format/em-format.c:2159
+#: ../em-format/em-format.c:1981 ../em-format/em-format.c:2160
 msgid "Error verifying signature"
 msgstr "Produciuse un erro ao comprobar a sinatura"
 
-#: ../em-format/em-format.c:1981 ../em-format/em-format.c:2146
-#: ../em-format/em-format.c:2160
+#: ../em-format/em-format.c:1982 ../em-format/em-format.c:2147
+#: ../em-format/em-format.c:2161
 msgid "Unknown error verifying signature"
 msgstr "Produciuse un erro descoÃ±ecido ao comprobar a sinatura"
 
-#: ../em-format/em-format.c:2251
+#: ../em-format/em-format.c:2252
 msgid "Could not parse PGP message: "
 msgstr "Non foi posÃbel analizar a mensaxe PGP: "
 
-#: ../em-format/em-format.c:2257 ../mail/em-folder-tree.c:656
-#: ../mail/mail-ops.c:624 ../plugins/caldav/caldav-browse-server.c:210
+#: ../em-format/em-format.c:2258 ../mail/em-folder-tree.c:655
+#: ../mail/mail-ops.c:659 ../plugins/caldav/caldav-browse-server.c:210
 #: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
@@ -8006,11 +8001,11 @@ msgid "A_dd Condition"
 msgstr "Enga_dir unha condiciÃ³n"
 
 #: ../filter/e-filter-rule.c:1130 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:320
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1130 ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1130 ../mail/em-utils.c:321
 msgid "Outgoing"
 msgstr "SaÃnte"
 
@@ -8136,7 +8131,7 @@ msgid "years"
 msgstr "anos"
 
 #: ../mail/e-mail-attachment-bar.c:86 ../mail/e-mail-attachment-bar.c:91
-#: ../mail/em-format-html-display.c:1122 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1156 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:124
 #: ../widgets/misc/e-attachment-paned.c:129
 msgid "Attachment"
@@ -8154,13 +8149,13 @@ msgstr "VisualizaciÃ³n de iconas"
 msgid "List View"
 msgstr "VisualizaciÃ³n de lista"
 
-#: ../mail/e-mail-browser.c:125 ../shell/e-shell-window-actions.c:1405
+#: ../mail/e-mail-browser.c:126 ../shell/e-shell-window-actions.c:1405
 #: ../shell/e-shell-window-actions.c:1412
 #: ../shell/e-shell-window-actions.c:1419
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
-#: ../mail/e-mail-browser.c:282
+#: ../mail/e-mail-browser.c:283
 msgid "(No Subject)"
 msgstr "(Sen asunto)"
 
@@ -8244,52 +8239,53 @@ msgid "Name"
 msgstr "Nome"
 
 #: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:738 ../mail/em-folder-tree.c:3138
+#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree.c:3148
 #: ../modules/mail/e-mail-shell-view-private.c:1118
 #: ../modules/mail/e-mail-shell-view-private.c:1129
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:730
+#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:718
 #: ../modules/mail/e-mail-shell-view-private.c:1116
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:742
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:730
 #: ../modules/mail/e-mail-shell-view-private.c:1120
 msgid "Outbox"
 msgstr "Caixa de saÃda"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:744
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:732
 #: ../modules/mail/e-mail-shell-view-private.c:1122
 msgid "Sent"
 msgstr "Enviados"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:733
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:721
 #: ../modules/mail/e-mail-shell-view-private.c:1124
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:581
+#: ../plugins/templates/templates.c:881 ../plugins/templates/templates.c:1158
+#: ../plugins/templates/templates.c:1168
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:128
 msgid "Migrating..."
 msgstr "Migrandoâ?¦"
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:161
 msgid "Migration"
 msgstr "MigraciÃ³n"
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:201
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migrando Â«%sÂ»:"
 
-#: ../mail/e-mail-migrate.c:660
+#: ../mail/e-mail-migrate.c:672
 msgid "Migrating Folders"
 msgstr "Migrando cartafoles"
 
-#: ../mail/e-mail-migrate.c:661
+#: ../mail/e-mail-migrate.c:673
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8301,7 +8297,7 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus cartafolesâ?¦"
 
-#: ../mail/e-mail-migrate.c:1126
+#: ../mail/e-mail-migrate.c:1140
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Non Ã© posÃbel crear os cartafoles de correo local en Â«%sÂ»: %s"
@@ -8310,19 +8306,15 @@ msgstr "Non Ã© posÃbel crear os cartafoles de correo local en Â«%sÂ»: %s"
 msgid "Please select a folder"
 msgstr "Seleccionar un cartafol"
 
-#. XXX e-error should provide a widget layout and API suitable
-#. *     for packing additional widgets to the right of the alert
-#. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:111
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-msgid "Do not ask me again"
-msgstr "Non preguntar de novo."
+#: ../mail/e-mail-reader-utils.c:109
+msgid "Do not warn me again"
+msgstr "Non avisarme de novo."
 
 #: ../mail/e-mail-reader.c:306 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:450
 msgid "C_opy"
 msgstr "C_opiar"
 
@@ -8339,25 +8331,24 @@ msgid_plural ""
 msgstr[0] "O cartafol Â«%sÂ» contÃ©n %d mensaxe duplicada. Desexa eliminala?"
 msgstr[1] "O cartafol Â«%sÂ» contÃ©n %d mensaxes duplicadas. Desexa eliminalas?"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:987 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:987 ../mail/em-folder-utils.c:450
 msgid "_Move"
 msgstr "_Mover"
 
-#. Check buttons
-#: ../mail/e-mail-reader.c:1265 ../mail/e-mail-reader.c:1423
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1437
+#: ../mail/e-mail-reader.c:1474
 msgid "_Do not ask me again."
 msgstr "_Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1480
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar sempre Â«Responder a:Â» para as listas de correo."
 
-#: ../mail/e-mail-reader.c:1581
+#: ../mail/e-mail-reader.c:1596
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar a mensaxeâ?¦"
@@ -8369,7 +8360,7 @@ msgstr[1] "Gardar as mensaxesâ?¦"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1617
 #: ../plugins/groupwise-features/notification.ui.h:1
 #: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
@@ -8377,559 +8368,555 @@ msgid_plural "Messages"
 msgstr[0] "Mensaxe"
 msgstr[1] "Mensaxes"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1891
 msgid "A_dd Sender to Address Book"
 msgstr "Enga_dir o remitente Ã¡ axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1893
 msgid "Add sender to address book"
 msgstr "Engadir o remitente Ã¡ axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1898
 msgid "Check for _Junk"
 msgstr "Comprobar se hai correo li_xo"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1900
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo lixo"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1905
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafolâ?¦"
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1907
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1912
 msgid "_Delete Message"
 msgstr "E_liminar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1914
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1919
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar pola _lista de correoâ?¦"
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1921
 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:1911
+#: ../mail/e-mail-reader.c:1926
 msgid "Filter on _Recipients..."
 msgstr "Filtrar polos _destinatariosâ?¦"
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1928
 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:1918
+#: ../mail/e-mail-reader.c:1933
 msgid "Filter on Se_nder..."
 msgstr "Filtrar polo re_mitenteâ?¦"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1935
 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:1925
+#: ../mail/e-mail-reader.c:1940
 msgid "Filter on _Subject..."
 msgstr "Filtrar polo a_suntoâ?¦"
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1942
 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:1932
+#: ../mail/e-mail-reader.c:1947
 msgid "A_pply Filters"
 msgstr "_Aplicar os filtros"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1949
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtrado Ã¡s mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1954
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxeâ?¦"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1956
 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:1946
+#: ../mail/e-mail-reader.c:1961
 msgid "_Clear Flag"
 msgstr "E_liminar a marca"
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1963
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Eliminar as marcas de seguimento das mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1968
 msgid "_Flag Completed"
 msgstr "_Marcar como completado"
 
-#: ../mail/e-mail-reader.c:1955
+#: ../mail/e-mail-reader.c:1970
 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:1960
+#: ../mail/e-mail-reader.c:1975
 msgid "Follow _Up..."
 msgstr "Seguimentoâ?¦"
 
-#: ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1977
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1982
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1984 ../mail/e-mail-reader.c:1991
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ReencamiÃ±ar a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1989
 msgid "Forward As _Attached"
 msgstr "ReencamiÃ±ar como un _anexo"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1996
 msgid "_Inline"
 msgstr "_Inserida"
 
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1998 ../mail/e-mail-reader.c:2005
 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:1988
+#: ../mail/e-mail-reader.c:2003
 msgid "Forward As _Inline"
 msgstr "ReencamiÃ±ar _inserida"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2010
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:1997 ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2012 ../mail/e-mail-reader.c:2019
 msgid "Forward the selected message quoted like a reply"
 msgstr "ReencamiÃ±ar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2017
 msgid "Forward As _Quoted"
 msgstr "ReencamiÃ±ar _citada"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2024
 msgid "_Load Images"
 msgstr "_Cargar as imaxes"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2026
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2031
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2033
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2038
 msgid "_Junk"
 msgstr "_Correo lixo"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2040
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo lixo"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2045
 msgid "_Not Junk"
 msgstr "_Non Ã© correo lixo"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2047
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2052
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2054
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2059
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2061
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2066
 msgid "_Unread"
 msgstr "_Sen ler"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2068
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2073
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe novaâ?¦"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2075
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2080
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2082
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para escribir unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2087
 msgid "_Open in New Window"
 msgstr "Abrir nunha xanela n_ova"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2089
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2094
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafolâ?¦"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2096
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2101
 msgid "_Switch to Folder"
 msgstr "_Cambiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2103
 msgid "Display the parent folder"
 msgstr "Mostrar o cartafol pai"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2108
 msgid "Switch to _next tab"
 msgstr "Cambiar Ã¡ lapela segui_nte"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2110
 msgid "Switch to the next tab"
 msgstr "Cambiar Ã¡ lapela seguinte"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2115
 msgid "Switch to _previous tab"
 msgstr "Cambiar Ã¡ lapela a_nterior"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2117
 msgid "Switch to the previous tab"
 msgstr "Cambiar Ã¡ lapela anterior"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2122
 msgid "Cl_ose current tab"
 msgstr "Pe_char a lapela actual"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2124
 msgid "Close current tab"
 msgstr "Pechar a lapela actual"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2129
 msgid "_Next Message"
 msgstr "Segui_nte mensaxe"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2131
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2136
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2138
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2143
 msgid "Next _Thread"
 msgstr "Seguin_te conversa"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2145
 msgid "Display the next thread"
 msgstr "Mostrar a seguinte conversa"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2150
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _sen ler"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2152
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2157
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2159
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2164
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2166
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2171
 msgid "Previous T_hread"
 msgstr "_Conversa anterior"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2173
 msgid "Display the previous thread"
 msgstr "Mostrar a conversa anterior"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2178
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe sen ler"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2180
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2187
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2194
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2199
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2201
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguÃ©n a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2206
 msgid "Remo_ve Attachments"
 msgstr "Eliminar os _anexos"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2208
 msgid "Remove attachments"
 msgstr "Eliminar os anexos"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2213
 msgid "Remove Du_plicate Messages"
 msgstr "Eliminar as mensaxes du_plicadas"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2215
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar se hai mensaxes seleccionadas que estean duplicadas"
 
-#: ../mail/e-mail-reader.c:2205 ../mail/mail.error.xml.h:102
+#: ../mail/e-mail-reader.c:2220 ../mail/mail.error.xml.h:102
 #: ../modules/calendar/e-cal-shell-view-actions.c:1465
 #: ../modules/mail/e-mail-attachment-handler.c:179
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2222
 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:2212 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2227 ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "Responder Ã¡ _lista"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2229
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Redactar unha resposta para a lista de correo da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2234
 #: ../modules/mail/e-mail-attachment-handler.c:186
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2236
 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:2226
+#: ../mail/e-mail-reader.c:2241
 msgid "_Save as mbox..."
 msgstr "Gardar como mboxâ?¦"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2243
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes seleccionadas como un ficheiro mbox"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2248
 msgid "Search Folder from Mailing _List..."
 msgstr "Cartafol de busca por _lista de correoâ?¦"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2250
 msgid "Create a search folder for this mailing list"
 msgstr "Crear un cartafol de busca para esta lista de correo"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2255
 msgid "Search Folder from Recipien_ts..."
 msgstr "Cartafol de busca por des_tinatariosâ?¦"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2257
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2262
 msgid "Search Folder from Sen_der..."
 msgstr "Cartafol de busca por _remitenteâ?¦"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2264
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2269
 msgid "Search Folder from S_ubject..."
 msgstr "Cartafol de busca por as_untoâ?¦"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2271
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2276
 msgid "_Message Source"
 msgstr "Fonte da _mensaxe"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2278
 msgid "Show the raw email source of the message"
 msgstr "Mostrar a fonte en bruto da mensaxe"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2290
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2292
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2297
 msgid "_Normal Size"
 msgstr "TamaÃ±o _normal"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2299
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaÃ±o orixinal"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2304
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2306
 msgid "Increase the text size"
 msgstr "Aumentar o tamaÃ±o do texto"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2311
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2313
 msgid "Decrease the text size"
 msgstr "DiminuÃr o tamaÃ±o do texto"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2320
 msgid "Create R_ule"
 msgstr "Crear unha r_egra"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2327
 msgid "Ch_aracter Encoding"
 msgstr "CodificaciÃ³n de car_acteres"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2334
 msgid "F_orward As"
 msgstr "ReencamiÃ±ar c_omoâ?¦"
 
-#: ../mail/e-mail-reader.c:2326
+#: ../mail/e-mail-reader.c:2341
 msgid "_Group Reply"
 msgstr "_Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:2333
+#: ../mail/e-mail-reader.c:2348
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2355
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2362
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2369
 msgid "_Zoom"
 msgstr "A_mpliar"
 
-#: ../mail/e-mail-reader.c:2379
+#: ../mail/e-mail-reader.c:2394
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimentoâ?¦"
 
-#: ../mail/e-mail-reader.c:2387
+#: ../mail/e-mail-reader.c:2402
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2406
 msgid "Mark as _Junk"
 msgstr "Marcar como correo l_ixo"
 
-#: ../mail/e-mail-reader.c:2395
+#: ../mail/e-mail-reader.c:2410
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo lixo"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2414
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:2403
+#: ../mail/e-mail-reader.c:2418
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:2407
+#: ../mail/e-mail-reader.c:2422
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2466
 msgid "_Caret Mode"
 msgstr "Activar o _cursor"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2468
 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:2459
+#: ../mail/e-mail-reader.c:2474
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:2461
+#: ../mail/e-mail-reader.c:2476
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrÃ³nico"
 
-#: ../mail/e-mail-reader.c:2699
-msgid "Unable to retrieve message"
-msgstr "Non foi posÃbel recuperar a mensaxe"
-
-#: ../mail/e-mail-reader.c:2761 ../mail/mail-ops.c:2068
+#: ../mail/e-mail-reader.c:2769 ../mail/mail-ops.c:2021
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando a mensaxe Â«%sÂ»"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3379 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:3369 ../mail/mail-config.ui.h:32
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:538
 #: ../plugins/google-account-setup/google-source.c:674
@@ -8937,101 +8924,101 @@ msgstr "Recuperando a mensaxe Â«%sÂ»"
 msgid "Default"
 msgstr "predeterminado"
 
-#: ../mail/e-mail-reader.c:3550
+#: ../mail/e-mail-reader.c:3544
 #: ../modules/mail/e-mail-attachment-handler.c:172
 msgid "_Forward"
 msgstr "_ReencamiÃ±ar "
 
-#: ../mail/e-mail-reader.c:3551
+#: ../mail/e-mail-reader.c:3545
 msgid "Forward the selected message to someone"
 msgstr "ReencamiÃ±ar a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:3570
+#: ../mail/e-mail-reader.c:3564
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:3571
+#: ../mail/e-mail-reader.c:3565
 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:3616 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3610 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:746
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:3649
+#: ../mail/e-mail-reader.c:3643
 #: ../modules/calendar/e-cal-shell-view-actions.c:1311
 #: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:3653
+#: ../mail/e-mail-reader.c:3647
 #: ../modules/calendar/e-cal-shell-view-actions.c:1304
 #: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3663 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3656 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader.c:4298
+#: ../mail/e-mail-reader.c:4326
 #, c-format
 msgid "Folder '%s'"
 msgstr "Cartafol Â«%sÂ»"
 
-#: ../mail/e-mail-session.c:643
+#: ../mail/e-mail-session.c:653
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introducir a frase de paso para %s"
 
-#: ../mail/e-mail-session.c:645
+#: ../mail/e-mail-session.c:655
 msgid "Enter Passphrase"
 msgstr "Introducir a frase de paso"
 
-#: ../mail/e-mail-session.c:648
+#: ../mail/e-mail-session.c:658
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introducir o contrasinal para %s"
 
-#: ../mail/e-mail-session.c:650
+#: ../mail/e-mail-session.c:660
 msgid "Enter Password"
 msgstr "Introducir o contrasinal"
 
-#: ../mail/e-mail-session.c:701
+#: ../mail/e-mail-session.c:713
 #, c-format
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaciÃ³n."
 
-#: ../mail/e-mail-session.c:871
+#: ../mail/e-mail-session.c:828
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "Non se proporcionou ningÃºn enderezo de destino, o reencamiÃ±amento cancelouse."
 
-#: ../mail/e-mail-session.c:880
+#: ../mail/e-mail-session.c:837
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Non se atopou ningunha conta que usar, o reencamiÃ±amento cancelouse."
 
-#: ../mail/e-mail-session.c:1284 ../mail/mail-ops.c:1220
+#: ../mail/e-mail-session.c:1241 ../mail/mail-ops.c:1254
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Abrindo o cartafol Â«%sÂ»"
 
-#: ../mail/e-mail-session.c:1300
+#: ../mail/e-mail-session.c:1257
 #, c-format
 msgid "Invalid folder: %s"
 msgstr "O cartafol non Ã© vÃ¡lido: %s"
 
-#: ../mail/e-mail-session-utils.c:490 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:485 ../mail/mail-ops.c:638
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Produciuse un fallo ao aplicar os filtros ao correo saÃnte: %s"
 
-#: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:509 ../mail/e-mail-session-utils.c:543
+#: ../mail/mail-ops.c:657 ../mail/mail-ops.c:688
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9040,17 +9027,17 @@ msgstr ""
 "Produciuse un fallo ao anexar a %s: %s\n"
 "No seu lugar anexaranse ao cartafol local Â«EnviadosÂ»."
 
-#: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:563 ../mail/mail-ops.c:708
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Produciuse un fallo ao anexar ao cartafol local Â«EnviadosÂ»: %s"
 
-#: ../mail/e-mail-session-utils.c:779 ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/e-mail-session-utils.c:774 ../mail/mail-ops.c:807
+#: ../mail/mail-ops.c:899
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../mail/e-mail-session-utils.c:850
+#: ../mail/e-mail-session-utils.c:845
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Eliminando a subscriciÃ³n do cartafol Â«%sÂ»"
@@ -9071,7 +9058,7 @@ msgstr "Marcar para facer seguimento"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:564 ../mail/mail-config.ui.h:69
+#: ../mail/em-account-editor.c:568 ../mail/mail-config.ui.h:72
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Sen cifrado"
@@ -9079,7 +9066,7 @@ msgstr "Sen cifrado"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:568 ../mail/mail-config.ui.h:126
+#: ../mail/em-account-editor.c:572 ../mail/mail-config.ui.h:130
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
@@ -9087,40 +9074,40 @@ msgstr "Cifrado TLS"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:572 ../mail/mail-config.ui.h:91
+#: ../mail/em-account-editor.c:576 ../mail/mail-config.ui.h:94
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:835 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:839 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../mail/em-account-editor.c:916
+#: ../mail/em-account-editor.c:920
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:917
+#: ../mail/em-account-editor.c:921
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/em-account-editor.c:918
+#: ../mail/em-account-editor.c:922
 msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1700 ../widgets/misc/e-account-tree-view.c:127
+#: ../mail/em-account-editor.c:1742 ../widgets/misc/e-account-tree-view.c:127
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../mail/em-account-editor.c:2087
+#: ../mail/em-account-editor.c:2167
 msgid "Mail Configuration"
 msgstr "ConfiguraciÃ³n do correo"
 
-#: ../mail/em-account-editor.c:2088
+#: ../mail/em-account-editor.c:2168
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9130,7 +9117,7 @@ msgstr ""
 "\n"
 "Prema en Â«AdianteÂ» para comezar."
 
-#: ../mail/em-account-editor.c:2091
+#: ../mail/em-account-editor.c:2171
 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 "
@@ -9140,19 +9127,19 @@ msgstr ""
 "necesitan encherse, a non ser que desexe incluÃr esta informaciÃ³n no correo "
 "que envÃe."
 
-#: ../mail/em-account-editor.c:2093 ../mail/em-account-editor.c:2256
+#: ../mail/em-account-editor.c:2173 ../mail/em-account-editor.c:2336
 msgid "Receiving Email"
 msgstr "RecepciÃ³n de correo"
 
-#: ../mail/em-account-editor.c:2094
+#: ../mail/em-account-editor.c:2174
 msgid "Please configure the following account settings."
 msgstr "Configurar os seguintes axustes da conta."
 
-#: ../mail/em-account-editor.c:2096 ../mail/em-account-editor.c:2756
+#: ../mail/em-account-editor.c:2176 ../mail/em-account-editor.c:2836
 msgid "Sending Email"
 msgstr "EnvÃo de correo"
 
-#: ../mail/em-account-editor.c:2097
+#: ../mail/em-account-editor.c:2177
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -9161,11 +9148,11 @@ msgstr ""
 "seguro, pregunte ao administrador do sistema ou provedor de acceso a "
 "Internet."
 
-#: ../mail/em-account-editor.c:2099 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2179 ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "InformaciÃ³n da conta"
 
-#: ../mail/em-account-editor.c:2100
+#: ../mail/em-account-editor.c:2180
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -9173,11 +9160,11 @@ msgstr ""
 "Introduza un nome descritivo para esta conta no espazo inferior.\n"
 "Este nome usarase sÃ³ para a visualizaciÃ³n."
 
-#: ../mail/em-account-editor.c:2104
+#: ../mail/em-account-editor.c:2184
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2185
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9192,29 +9179,29 @@ msgstr ""
 "\n"
 "Prema en Â«AplicarÂ» para gardar os axustes."
 
-#: ../mail/em-account-editor.c:2570
+#: ../mail/em-account-editor.c:2650
 msgid "Check for _new messages every"
 msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/em-account-editor.c:2578
+#: ../mail/em-account-editor.c:2658
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2861
+#: ../mail/em-account-editor.c:2941
 msgid "Please select a folder from the current account."
 msgstr "Seleccionar un cartafol desde a conta actual."
 
-#: ../mail/em-account-editor.c:3171 ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:3251 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "Seguranza"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
+#: ../mail/em-account-editor.c:3297 ../mail/em-account-editor.c:3365
 msgid "Receiving Options"
 msgstr "OpciÃ³ns de recepciÃ³n"
 
-#: ../mail/em-account-editor.c:3218 ../mail/em-account-editor.c:3286
+#: ../mail/em-account-editor.c:3298 ../mail/em-account-editor.c:3366
 msgid "Checking for New Messages"
 msgstr "Comprobando se hai mensaxes novas"
 
@@ -9235,25 +9222,25 @@ msgstr "-----Mensaxe orixinal-----"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1851
+#: ../mail/em-composer-utils.c:1852
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "A mensaxe a %s sobre Â«%sÂ» o %s leuse."
 
-#: ../mail/em-composer-utils.c:1905
+#: ../mail/em-composer-utils.c:1906
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "NotificaciÃ³n de recepciÃ³n para: Â«%sÂ»"
 
-#: ../mail/em-composer-utils.c:2356
+#: ../mail/em-composer-utils.c:2366
 msgid "an unknown sender"
 msgstr "un remitente descoÃ±ecido"
 
-#: ../mail/em-composer-utils.c:2787
+#: ../mail/em-composer-utils.c:2797
 msgid "Posting destination"
 msgstr "Destino da publicaciÃ³n"
 
-#: ../mail/em-composer-utils.c:2788
+#: ../mail/em-composer-utils.c:2798
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
@@ -9374,7 +9361,7 @@ msgstr "non estÃ¡ estabelecido"
 msgid "is set"
 msgstr "estÃ¡ estabelecido"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "Correo lixo"
 
@@ -9541,7 +9528,7 @@ msgstr "Uso da cota"
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:76
 msgid "<click here to select a folder>"
 msgstr "<prema aquÃ para seleccionar un cartafol>"
 
@@ -9557,7 +9544,7 @@ msgstr "_Nome do cartafol:"
 #: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
 #: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
+#: ../mail/mail-vfolder.c:1171 ../mail/mail-vfolder.c:1246
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
@@ -9566,7 +9553,7 @@ msgstr "Cartafoles de busca"
 msgid "UNMATCHED"
 msgstr "SEN COINCIDENCIAS"
 
-#: ../mail/em-folder-tree-model.c:808 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:796 ../mail/em-folder-tree-model.c:1074
 msgid "Loading..."
 msgstr "Cargandoâ?¦"
 
@@ -9575,74 +9562,74 @@ msgstr "Cargandoâ?¦"
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en Â«%sÂ»"
 
-#: ../mail/em-folder-tree.c:625
+#: ../mail/em-folder-tree.c:624
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carÃ¡cter Â«/Â»"
 
-#: ../mail/em-folder-tree.c:1245
+#: ../mail/em-folder-tree.c:1244
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1482
+#: ../mail/em-folder-tree.c:1481
 msgid "Mail Folder Tree"
 msgstr "Ã?rbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:1938 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:1937 ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:1942 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1941 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando o cartafol %s"
 
-#: ../mail/em-folder-tree.c:1951 ../mail/message-list.c:2243
+#: ../mail/em-folder-tree.c:1950 ../mail/message-list.c:2242
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:1955 ../mail/message-list.c:2245
+#: ../mail/em-folder-tree.c:1954 ../mail/message-list.c:2244
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:1974
+#: ../mail/em-folder-tree.c:1973
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non Ã© posÃbel soltar as mensaxe(s) no almacenamento do nivel superior"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-utils.c:451
 msgid "Move Folder To"
 msgstr "Mover o cartafol a"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-utils.c:451
 msgid "Copy Folder To"
 msgstr "Copiar o cartafol a"
 
-#: ../mail/em-folder-utils.c:571
-#: ../plugins/groupwise-features/share-folder-common.c:138
+#: ../mail/em-folder-utils.c:600
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Creando o cartafol Â«%sÂ»"
 
-#: ../mail/em-folder-utils.c:741
+#: ../mail/em-folder-utils.c:772
 msgid "Create Folder"
 msgstr "Crear un cartafol"
 
-#: ../mail/em-folder-utils.c:742
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../mail/em-folder-utils.c:773
+#: ../plugins/groupwise-features/install-shared.c:190
+#: ../plugins/groupwise-features/share-folder-common.c:365
 msgid "Specify where to create the folder:"
 msgstr "Indicar onde crear o cartafol:"
 
-#: ../mail/em-format-html-display.c:84 ../mail/em-format-html.c:1601
+#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1684
 msgid "Unsigned"
 msgstr "Sen asinar"
 
-#: ../mail/em-format-html-display.c:84
+#: ../mail/em-format-html-display.c:85
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9650,11 +9637,11 @@ msgstr ""
 "Esta mensaxe non estÃ¡ asinada. Non hai garantÃa de que a mensaxe sexa "
 "autÃ©ntica."
 
-#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1602
+#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1685
 msgid "Valid signature"
 msgstr "A sinatura Ã© correcta"
 
-#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html-display.c:86
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9662,11 +9649,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ asinada e Ã© correcta, o que significa que Ã© moi probÃ¡bel "
 "que a mensaxe sexa autÃ©ntica."
 
-#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1603
+#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1686
 msgid "Invalid signature"
 msgstr "A sinatura Ã© incorrecta"
 
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:87
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9674,11 +9661,11 @@ msgstr ""
 "Non Ã© posÃbel comprobar a sinatura desta mensaxe, puido alterarse no "
 "trÃ¡nsito."
 
-#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1687
 msgid "Valid signature, but cannot verify sender"
 msgstr "A sinatura Ã© correcta, pero non Ã© posÃbel comprobar o remitente"
 
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:88
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9686,22 +9673,22 @@ msgstr ""
 "Esta mensaxe estÃ¡ asinada cunha sinatura correcta, pero non foi posÃbel "
 "comprobar o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1605
+#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1688
 msgid "Signature exists, but need public key"
 msgstr "A sinatura existe, pero precisa unha chave pÃºblica"
 
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 "Esta mensaxe estÃ¡ asinada pero non existe a correspondete chave pÃºblica."
 
-#: ../mail/em-format-html-display.c:95 ../mail/em-format-html.c:1611
+#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1694
 msgid "Unencrypted"
 msgstr "Sen cifrar"
 
-#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html-display.c:96
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9709,11 +9696,11 @@ msgstr ""
 "Esta mensaxe non estÃ¡ cifrada. O seu contido pode verse no seu trÃ¡nsito a "
 "travÃ©s de Internet."
 
-#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1612
+#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1695
 msgid "Encrypted, weak"
 msgstr "Cifrada, dÃ©bil"
 
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:97
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -9723,11 +9710,11 @@ msgstr ""
 "ser difÃcil, pero non imposÃbel para un intruso ver o contido desta mensaxe "
 "nun tempo razoÃ¡bel."
 
-#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1613
+#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1696
 msgid "Encrypted"
 msgstr "Cifrada"
 
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:98
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9735,11 +9722,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ cifrada. SerÃa difÃcil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1614
+#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1697
 msgid "Encrypted, strong"
 msgstr "Cifrada, forte"
 
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:99
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -9749,15 +9736,15 @@ msgstr ""
 "difÃcil para un intruso ver o contido desta mensaxe dentro dun perÃodo de "
 "tempo razoÃ¡bel."
 
-#: ../mail/em-format-html-display.c:236 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:237 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Visualizar o certificado"
 
-#: ../mail/em-format-html-display.c:249
+#: ../mail/em-format-html-display.c:250
 msgid "This certificate is not viewable"
 msgstr "Este certificado non Ã© visÃbel"
 
-#: ../mail/em-format-html-display.c:538
+#: ../mail/em-format-html-display.c:539
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9766,28 +9753,28 @@ msgstr ""
 "procesamento demora demasiado. Pode visualizalo sen formato ou ben con un "
 "editor de texto externo."
 
-#: ../mail/em-format-html-display.c:804
+#: ../mail/em-format-html-display.c:806
 msgid "Completed on"
 msgstr "Completado o"
 
-#: ../mail/em-format-html-display.c:812
+#: ../mail/em-format-html-display.c:814
 msgid "Overdue:"
 msgstr "Atrasada:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:816
+#: ../mail/em-format-html-display.c:818
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:1047 ../mail/em-format-html-display.c:1094
+#: ../mail/em-format-html-display.c:1081 ../mail/em-format-html-display.c:1128
 msgid "View _Unformatted"
 msgstr "Visualizar sen _formato"
 
-#: ../mail/em-format-html-display.c:1049
+#: ../mail/em-format-html-display.c:1083
 msgid "Hide _Unformatted"
 msgstr "Oc_ultar sen formato"
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1148
 msgid "O_pen With"
 msgstr "A_brir con"
 
@@ -9796,55 +9783,63 @@ msgstr "A_brir con"
 msgid "Page %d of %d"
 msgstr "PÃ¡xina %d de %d"
 
-#: ../mail/em-format-html.c:161
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "Formatando a mensaxe"
 
-#: ../mail/em-format-html.c:360
+#: ../mail/em-format-html.c:365
 msgid "Formatting Message..."
 msgstr "Formatando a mensaxeâ?¦"
 
-#: ../mail/em-format-html.c:1445 ../mail/em-format-html.c:1455
+#: ../mail/em-format-html.c:1528 ../mail/em-format-html.c:1538
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Obtendo Â«%sÂ»"
 
-#: ../mail/em-format-html.c:1976
+#: ../mail/em-format-html.c:2059
 msgid "Unknown external-body part."
 msgstr "Parte do corpo externo descoÃ±ecida."
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2067
 msgid "Malformed external-body part."
 msgstr "Parte do corpo externo formada incorrectamente."
 
-#: ../mail/em-format-html.c:2014
+#: ../mail/em-format-html.c:2097
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro ao sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:2025
+#: ../mail/em-format-html.c:2108
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro ao ficheiro local (%s) correcto no sitio Â«%sÂ»"
 
-#: ../mail/em-format-html.c:2027
+#: ../mail/em-format-html.c:2110
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro ao ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:2048
+#: ../mail/em-format-html.c:2131
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro aos datos remotos (%s)"
 
-#: ../mail/em-format-html.c:2059
+#: ../mail/em-format-html.c:2142
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro aos datos externos descoÃ±ecidos (tipo Â«%sÂ»)"
 
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2816
+#: ../plugins/mail-notification/mail-notification.c:410
+#, c-format
+msgid "From: %s"
+msgstr "De: %s:"
+
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2763
+#: ../mail/em-format-html.c:2893
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Esta mensaxe enviouse por %s no nome de %s"
@@ -9855,61 +9850,61 @@ msgstr "Esta mensaxe enviouse por %s no nome de %s"
 msgid "No HTML stream available"
 msgstr "Non hai un fluxo HTML dispoÃ±Ãbel"
 
-#: ../mail/em-subscription-editor.c:1105
+#: ../mail/em-subscription-editor.c:1103
 msgid "Folder Subscriptions"
 msgstr "SubscriciÃ³ns de cartafoles"
 
-#: ../mail/em-subscription-editor.c:1144
+#: ../mail/em-subscription-editor.c:1142
 msgid "_Account:"
 msgstr "Cont_a:"
 
-#: ../mail/em-subscription-editor.c:1159
+#: ../mail/em-subscription-editor.c:1157
 msgid "Clear Search"
 msgstr "Limpar a busca"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1175
 msgid "Sho_w items that contain:"
 msgstr "Most_rar os elementos que conteÃ±an:"
 
-#: ../mail/em-subscription-editor.c:1216
+#: ../mail/em-subscription-editor.c:1214
 msgid "Subscribe to the selected folder"
 msgstr "Subscribir o cartafol seleccionado"
 
-#: ../mail/em-subscription-editor.c:1217
+#: ../mail/em-subscription-editor.c:1215
 msgid "Su_bscribe"
 msgstr "Su_bscribir"
 
-#: ../mail/em-subscription-editor.c:1228
+#: ../mail/em-subscription-editor.c:1226
 #: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "Unsubscribe from the selected folder"
 msgstr "Cancelar a subscriciÃ³n ao cartafol seleccionado"
 
-#: ../mail/em-subscription-editor.c:1229
+#: ../mail/em-subscription-editor.c:1227
 #: ../modules/mail/e-mail-shell-view-actions.c:1176
 msgid "_Unsubscribe"
 msgstr "Cancelar a s_ubscriciÃ³n"
 
-#: ../mail/em-subscription-editor.c:1240
+#: ../mail/em-subscription-editor.c:1238
 msgid "Collapse all folders"
 msgstr "Pregar todos os cartafoles"
 
-#: ../mail/em-subscription-editor.c:1241
+#: ../mail/em-subscription-editor.c:1239
 msgid "C_ollapse All"
 msgstr "Pregar t_odo"
 
-#: ../mail/em-subscription-editor.c:1251
+#: ../mail/em-subscription-editor.c:1249
 msgid "Expand all folders"
 msgstr "Despregar todos os cartafoles"
 
-#: ../mail/em-subscription-editor.c:1252
+#: ../mail/em-subscription-editor.c:1250
 msgid "E_xpand All"
 msgstr "Despre_gar todo"
 
-#: ../mail/em-subscription-editor.c:1262
+#: ../mail/em-subscription-editor.c:1260
 msgid "Refresh the folder list"
 msgstr "Actualizar a lista de cartafoles"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1272
 msgid "Stop the current operation"
 msgstr "Deter a operaciÃ³n actual"
 
@@ -9924,16 +9919,16 @@ msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "EstÃ¡ seguro de que desexa abrir %d mensaxe Ã¡ vez?"
 msgstr[1] "EstÃ¡ seguro de que desexa abrir %d mensaxes Ã¡ vez?"
 
-#: ../mail/em-utils.c:153
+#: ../mail/em-utils.c:157
 #: ../modules/mailto-handler/evolution-mailto-handler.c:151
 msgid "_Do not show this message again"
 msgstr "_Non mostrar esta mensaxe outra vez"
 
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:332
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#: ../mail/em-utils.c:904
+#: ../mail/em-utils.c:908
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -10138,19 +10133,25 @@ msgstr "Largura predeterminada da xanela do buscador de mensaxes."
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
+"Describes wheter message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr "Describe se as "
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 "Determina se hai que buscar enderezos para filtrar correo lixo na axenda de "
 "enderezos local"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina se hai que buscar o enderezo de correo do remitente na axenda de "
 "enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10163,13 +10164,13 @@ msgstr ""
 "enderezos remotas (LDAP, por exemplo) estÃ¡n marcadas para o completado "
 "automÃ¡tico."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina se se deben usar as cabeceiras personalizadas para a detecciÃ³n de "
 "correo lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10179,7 +10180,7 @@ msgstr ""
 "correo lixo. Se esta opciÃ³n estÃ¡ activada e se mencionan as cabeceiras, "
 "mellorarase a velocidade de detecciÃ³n do correo lixo."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -10187,48 +10188,48 @@ msgstr ""
 "Determina se se debe usar o mesmo tipo de letra para as liÃ±as Â«DeÂ» e "
 "Â«AsuntoÂ» da columna Â«MensaxesÂ» na visualizaciÃ³n vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "Cartafol para cargar/anexar os ficheiros no editor de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "Cartafol onde gardar os ficheiros enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Desactivar ou activar a abreviaciÃ³n dos nomes de cartafol na barra lateral"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr "Mostrar sÃ³ as mensaxes de texto que non excedan de certo tamaÃ±o"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "Non engadir un delimitador de sinatura"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Mostrar os erros de ortografÃa mentres se escribe."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "Baleirar os cartafoles do correo lixo ao saÃr"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "Baleirar os cartafoles do lixo ao saÃr"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles do correo lixo ao saÃr do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles do lixo ao saÃr do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -10236,31 +10237,31 @@ msgstr ""
 "Activar as imaxes animadas no correo HTML. Moitos usuarios atopan as imaxes "
 "animadas molestas e prefiren ver unha mensaxe estÃ¡tica."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Activar o modo de cursor para poder ver un cursor ao ler un correo."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "Activar ou desactivar a barra de espazo mÃ¡xica"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activar ou desactivar a confirmaciÃ³n cando se marcan varias mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "Activar ou desactivar a caracterÃstica de busca ao teclear"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
 msgstr "Activar os cartafoles de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
 msgstr "Activar os cartafoles de busca ao iniciar."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10268,7 +10269,7 @@ msgstr ""
 "Activar a barra de busca lateral para permitir a busca interactiva de nomes "
 "de cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10276,7 +10277,7 @@ msgstr ""
 "Activar esta opciÃ³n para usar a barra espazadora para desprazarse pola "
 "mensaxe, na lista de mensaxes e nos cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -10284,27 +10285,27 @@ msgstr ""
 "Activar a visualizaciÃ³n dos textos das mensaxes que non excedan o tamaÃ±o "
 "definido pola chave 'message_text_part_limit'."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Activar o uso dos axustes de visualizaciÃ³n da lista de mensaxes similares en "
 "todos os cartafoles"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Activar o uso dos axustes de visualizaciÃ³n da lista de mensaxes similares en "
 "todos os cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo de cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar os nomes de ficheiro Ã¡ forma de Outlook/GMail\" "
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -10316,31 +10317,31 @@ msgstr ""
 "ficheiro cos caracteres UTF-8 que usa o Evolution, porque estes non seguen a "
 "RFC 2231 senÃ³n que usan un estÃ¡ndar RFC 2047 incorrecto."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr "Limpar a caixa de saÃda despois do filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Forward message."
 msgstr "ReencamiÃ±ar a mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr "A resposta ao grupo responde Ã¡ lista"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "Altura do panel da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "Altura do panel da lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta a previsualizaciÃ³n por cartafol e elimina a selecciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10348,7 +10349,7 @@ msgstr ""
 "Se un usuario tenta abrir 10 ou mÃ¡is mensaxes ao mesmo tempo, pedir a "
 "confirmaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -10359,11 +10360,11 @@ msgstr ""
 "mapee a un visualizador de compoÃ±entes Bonobo na base de datos de tipos MIME "
 "do GNOME."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr "Ignorar Â«Responder a:Â» para as listas:"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -10371,7 +10372,7 @@ msgstr ""
 "Altura inicial da xanela Â«Editor de filtrosÂ». O valor actualÃzase a medida "
 "que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10379,7 +10380,7 @@ msgstr ""
 "Altura inicial da xanela Â«SubscriciÃ³ns de cartafolesÂ». O valor actualÃzase a "
 "medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10387,7 +10388,7 @@ msgstr ""
 "Altura inicial da xanela Â«Editor do cartafol de buscaÂ». O valor actualÃzase "
 "a medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10395,7 +10396,7 @@ msgstr ""
 "Altura inicial da xanela Â«Enviar e recibir correo electrÃ³nicoÂ». O valor "
 "actualÃzase a medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -10408,7 +10409,7 @@ msgstr ""
 "xanela Â«Editor de filtrosÂ». Esta chave sÃ³ existe como un detalle de "
 "implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10421,7 +10422,7 @@ msgstr ""
 "cartafolesÂ» non Ã© maximizÃ¡bel. Esta chave sÃ³ existe como un detalle de "
 "implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10434,7 +10435,7 @@ msgstr ""
 "de buscaÂ» non Ã© maximizÃ¡bel. Esta chave sÃ³ existe como un detalle de "
 "implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10448,7 +10449,7 @@ msgstr ""
 "xanela Â«Enviar e recibir correoÂ». Esta chave sÃ³ existe como un detalle de "
 "implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -10456,7 +10457,7 @@ msgstr ""
 "Largura inicial da xanela Â«Editor de filtrosÂ». O valor actualÃzase a medida "
 "que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10464,7 +10465,7 @@ msgstr ""
 "Largura inicial da xanela Â«SubscriciÃ³ns de cartafolesÂ». O valor actualÃzase "
 "a medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10472,7 +10473,7 @@ msgstr ""
 "Largura inicial da xanela Â«Editor do cartafol de buscaÂ». O valor actualÃzase "
 "a medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10480,7 +10481,7 @@ msgstr ""
 "Largura inicial da xanela Â«Enviar e recibir correoÂ». O valor actualÃzase a "
 "medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -10492,7 +10493,7 @@ msgstr ""
 "Ã¡ lista de correo mediante a cal recibiu a copia da mensaxe que estÃ¡ "
 "respondendo."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -10502,7 +10503,7 @@ msgstr ""
 "cartafol de busca bÃ³rranse as mensaxes permanentemente, non sÃ³ dos "
 "resultados da busca."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -10510,7 +10511,7 @@ msgstr ""
 "Activa/desactiva as preguntas que avisan de que estÃ¡ enviando unha resposta "
 "privada a un correo que chegou a travÃ©s dunha lista de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -10518,7 +10519,7 @@ msgstr ""
 "Activa/desactiva as mensaxes que avisan de que estÃ¡ enviando unha resposta a "
 "moitas persoas."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -10529,7 +10530,7 @@ msgstr ""
 "a lista estabelece unha cabeceira Â«Responder a:Â» que redirecciona a sÃºa "
 "resposta de novo Ã¡ lista."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -10537,42 +10538,42 @@ msgstr ""
 "Activa/desactiva as preguntas que avisan de que estÃ¡ tentando enviar unha "
 "mensaxe a destinatarios non insertados como enderezos de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Junk was run"
 msgstr "A Ãºltima vez que se baleirou o correo lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Last time Empty Trash was run"
 msgstr "A Ãºltima vez que se baleirou o lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Layout style"
 msgstr "Estilo da disposiciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel a partir do que se deberÃa rexistrar a mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas coas cores asociadas"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Lista dos tipos MIME para os que comprobar os visualizadores de compoÃ±entes "
 "do Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "Lista de licenzas aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10581,17 +10582,17 @@ msgstr ""
 "contÃ©n cadeas que nomean subcartafoles relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceiras personalizadas e o seu estado de activaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista dos cÃ³digos de idioma dos dicionarios usados para a comprobaciÃ³n "
 "ortogrÃ¡fica."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -10600,15 +10601,15 @@ msgstr ""
 "lista contÃ©n cadeas que conteÃ±en nome:cor, onde a cor usa a codificaciÃ³n "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos coa licenza aceptada."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
 msgstr "Cargar as imaxes das mensaxes HTML sobre HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -10618,90 +10619,90 @@ msgstr ""
 "Â«0Â» - Non cargar nunca as imaxes de fÃ³ra da rede. Â«1Â» - Cargar as imaxes nas "
 "mensaxes dos contactos. Â«2Â» - Cargar sempre as imaxes de fÃ³ra da rede."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "Rexistrar as acciÃ³ns de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "Rexistrar as acciÃ³ns de filtrado no ficheiro indicado."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para as acciÃ³ns de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para as acciÃ³ns de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser height"
 msgstr "Altura do buscador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr "Buscador de correo maximizado"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mail browser width"
 msgstr "Largura do buscador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despois do tempo de espera indicado"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despois do tempo de espera indicado."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar as citas na Â«PrevisualizaciÃ³nÂ» da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar as citas na Â«PrevisualizaciÃ³nÂ» da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr "LÃmite do texto da mensaxe para a visualizaciÃ³n"
 
 # (pofilter) gconf: do not translate gconf attribute: "source"
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualizaciÃ³n da mensaxe (Â«normalÂ», Â«cabeceiras completasÂ», "
 "Â«fonteÂ»)"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
 msgstr "NÃºmero mÃnimo de dÃas antes de baleirar o correo lixo ao saÃr"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum days between emptying the trash on exit"
 msgstr "NÃºmero mÃnimo de dÃas antes de baleirar o lixo ao saÃr"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tempo mÃnimo antes de baleirar o correo lixo ao saÃr, en dÃas."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mÃnimo antes de baleirar o lixo ao saÃr, en dÃas."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "NÃºmero de enderezos para mostrar en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Original message."
 msgstr "Mensaxe orixinal."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
 msgstr "Ruta onde a galerÃa de imaxes deberÃa buscar o seu contido"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
@@ -10710,119 +10711,119 @@ msgstr ""
 "sempre - pechar sempre a xanela do buscador    preguntar - (ou calquera "
 "valor) preguntar ao usuario"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Preguntar antes de enviar a destinatarios non inseridos como enderezos de "
 "correo."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "Avisar cando o Â«AsuntoÂ» estea baleiro"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Avisar ao usuario cando tente expurgar un cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Avisar ao usuario cando tente enviar unha mensaxe sen asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "Avisar cando se eliminen mensaxes nun cartafol de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Avisar cando a lista de correo secuestre as respostas privadas"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying privately to list messages"
 msgstr "Avisar cando se responda de forma privada a correos dunha lista"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when replying to many recipients"
 msgstr "Avisar ao responder a moitos destinatarios"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "Avisar cando o usuario expurgue"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr "Avisar cando o usuario encha sÃ³ o campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Avisar cando o usuario tente abrir dez ou mÃ¡is mensaxes ao mesmo tempo"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "Avisar ao enviar mensaxes en HTML a destinatarios que non desexen recibilas."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Avisar cando o usuario tente enviar unha mensaxe sen cubrir os campos Â«ParaÂ» "
 "ou Â«CCÂ»."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Avisar cando o usuario tente enviar un HTML non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "Avisar cando se marquen varias mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr "PoÃ±er sinaturas personalizadas no inicio das respostas"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Put the cursor at the bottom of replies"
 msgstr "PoÃ±er o cursor ao fondo da resposta"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "RecoÃ±ecer as emoticonas no texto e substituÃlas con imaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "RecoÃ±ecer as ligazÃ³ns no texto e substituÃlas."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "Realizar a proba do correo lixo no correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "Cartafol onde gardar"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
 msgstr "Buscar a fotografÃa do remitente nas axendas locais de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "Enviar o correo en HTML de forma predeterminada"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "Enviar o correo en HTML de forma predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
 msgstr "Columna cos enderezos dos remitentes na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronizaciÃ³n do servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -10830,64 +10831,64 @@ msgstr ""
 "Estabelecer como verdadeiro no caso de que se queira engadir o delimitador "
 "de sinatura antes da sinatura cando escriba un correo electrÃ³nico."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar o campo Â«CcoÂ» ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostrar o campo Â«CcÂ» ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar o campo Â«DeÂ» ao enviar unha mensaxe a un grupo de discusiÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 "Mostrar o campo Â«Respostar aÂ» ao enviar unha mensaxe a un grupo de discusiÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostrar o campo Â«Respostar aÂ» ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "Mostrar as animaciÃ³ns"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
 msgstr "Mostrar todas as cabeceiras das mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostrar todas as cabeceiras ao visualizar as mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animaciÃ³ns."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar as mensaxes eliminadas (riscadas) na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
 msgstr "Mostrar as imaxes animadas"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar o valor orixinal da cabeceira Â«DataÂ»."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "Mostrar a fotografÃa do remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10895,7 +10896,7 @@ msgstr ""
 "Mostrar o campo Â«CcoÂ» ao enviar unha mensaxe de correo. Isto pÃ³dese "
 "configurar no menÃº Â«VisualizaciÃ³nÂ» cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10903,7 +10904,7 @@ msgstr ""
 "Mostrar o campo Â«CcÂ» ao enviar unha mensaxe de correo. Isto pÃ³dese "
 "configurar no menÃº Â«VisualizaciÃ³nÂ» cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -10912,7 +10913,7 @@ msgstr ""
 "pÃ³dese configurar no menÃº Â«VisualizaciÃ³nÂ» cando se selecciona unha conta de "
 "novas."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -10921,7 +10922,7 @@ msgstr ""
 "discusiÃ³n. Isto pÃ³dese configurar no menÃº Â«VisualizaciÃ³nÂ» cando se "
 "selecciona unha conta de novas."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -10929,14 +10930,14 @@ msgstr ""
 "Mostrar o campo Â«Responder aÂ» ao enviar unha mensaxe de correo. Isto pÃ³dese "
 "configurar no menÃº Â«VisualizaciÃ³nÂ» cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Mostrar o enderezo do remitente nunha columna separada na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -10946,12 +10947,12 @@ msgstr ""
 "distinto). Doutro xeito mostrar o valor da cabeceira Â«DataÂ» no formato "
 "preferido polo usuario e o fuso de hora local."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar a fotografÃa do remitente no panel de lectura da mensaxe."
 
 #
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -10970,41 +10971,45 @@ msgstr ""
 "mesmo. Funciona comparando a cabeceira Â«Responder a:Â» cunha cabeceira "
 "Â«Responder Ã¡ lista:Â», se existe."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "ComprobaciÃ³n ortogrÃ¡fica en liÃ±a"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "Cor da comprobaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "Idiomas para a comprobaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr "Estado das cabeceiras da mensaxe na vista con paneis"
+
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The default plugin for Junk hook"
 msgstr "O engadido predeterminado para o tratamento do correo lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "A Ãºltima vez que se baleirou o correo lixo, en dÃas desde o 1 de xaneiro de "
 "1970 (Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "A Ãºltima vez que se baleirou o lixo, en dÃas desde o 1 de xaneiro de 1970 "
 "(Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11016,11 +11021,11 @@ msgstr ""
 "panel de previsualizaciÃ³n embaixo da lista de mensaxes. Â«1Â» (visualizaciÃ³n "
 "vertical) mostra o panel de previsualizaciÃ³n ao lado da lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
 msgstr "O tipo de letra do terminal para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
@@ -11028,7 +11033,7 @@ msgstr ""
 "O texto inserido ao reencamiÃ±ar unha mensaxe, informando que a continuaciÃ³n "
 "vai a mensaxe reencamiÃ±ada."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
@@ -11036,7 +11041,7 @@ msgstr ""
 "O texto inserido ao responder unha mensaxe, informando que a continuaciÃ³n "
 "vai a mensaxe orixinal."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
@@ -11044,11 +11049,11 @@ msgstr ""
 "O texto inserido cando se responde unha mensaxe, atribuÃndolle a mensaxe ao "
 "autor orixinal."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
 msgstr "O tipo de letra de largura variÃ¡bel para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11056,7 +11061,7 @@ msgstr ""
 "Isto pode ter tres valores posÃbeis: Â«0Â» para erros; Â«1Â» para avisos; Â«2Â» "
 "para mensaxes de depuraciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -11066,7 +11071,7 @@ msgstr ""
 "Evolution, indicado en KB. O tamaÃ±o predeterminado Ã© 4096 (4MB). Este valor "
 "Ãºsase sÃ³ cando a chave 'force_message_limit' estÃ¡ activada."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11076,7 +11081,7 @@ msgstr ""
 "engadidos activados. Se o engadido predeterminado listado estÃ¡ desactivado "
 "non se usarÃ¡n os outros engadidos dispoÃ±Ãbeis."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11085,7 +11090,7 @@ msgstr ""
 "Isto deselecciona o correo da lista e elimina a previsualizaciÃ³n de ese "
 "cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11097,7 +11102,7 @@ msgstr ""
 "estrutura XML Ã© &lt;header enabled&gt; - defÃnao como activado para mostrar "
 "a cabeceira na visualizaciÃ³n do correo."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11108,11 +11113,11 @@ msgstr ""
 "para excluÃr os correos enviados por contactos coÃ±ecidos desde o filtro de "
 "correo lixo."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opciÃ³n poderÃa axudar a mellorar a velocidade de recepciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11120,7 +11125,7 @@ msgstr ""
 "Isto define o nÃºmero de enderezos que se mostra na visualizaciÃ³n da lista de "
 "mensaxes predeterminada, para os restantes mostrarase 'â?¦'."
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
@@ -11128,7 +11133,7 @@ msgstr ""
 "Esta opciÃ³n indica se as conversas deben estar despregadas ou pregadas por "
 "omisiÃ³n. Ã? necesario reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11138,7 +11143,7 @@ msgstr ""
 "mensaxe de cada conversa en vez de pola data das mensaxes. Ã? necesario "
 "reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
@@ -11148,53 +11153,53 @@ msgstr ""
 "de imaxes do sistema, xeralmente localizado en ~/Imaxes. Este cartafol "
 "usarase tamÃ©n cando a ruta estabelecida non apunta a un cartafol existente."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de mensaxes por conversas baseadas no asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "Tempo de espera para marcar unha mensaxe como vista"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "Tempo de espera para marcar unha mensaxe como vista."
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
 msgstr "Cadea UID para a conta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Cor de subliÃ±ado para as palabras escritas incorrectamente cando se usa a "
 "comprobaciÃ³n ortogrÃ¡fica en liÃ±a."
 
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar o daemon e o cliente SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usar o daemon e o cliente SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use custom fonts"
 msgstr "Usar tipos de letra personalizados"
 
-#: ../mail/evolution-mail.schemas.in.h:220
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipos de letra personalizados para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Use only local spam tests."
 msgstr "Usar sÃ³ probas locais de correo lixo."
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usar sÃ³ as probas locais de correo lixo (sen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:223
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -11204,7 +11209,7 @@ msgstr ""
 "responde a unha mensaxe. Isto determina se o cursor se sitÃºa no inicio da "
 "mensaxe ou no final."
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -11214,17 +11219,17 @@ msgstr ""
 "responden a unha mensaxe. Isto determina se a sinatura se sitÃºa no inicio da "
 "mensaxe ou no final."
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Variable width font"
 msgstr "Tipo de letra de largura variÃ¡bel"
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Indica se hai que engadir unha solicitude de confirmaciÃ³n de lectura de "
 "forma predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -11235,7 +11240,7 @@ msgstr ""
 "cada X minutosÂ». Esta opciÃ³n Ãºsase conxuntamente coa opciÃ³n "
 "'send_recv_on_start'."
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
@@ -11243,13 +11248,13 @@ msgstr ""
 "Indica se debe buscar novas mensaxes ao iniciar o Evolution. InclÃºe o envÃo "
 "de mensaxes desde a caixa de saÃda."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Indica se hai que desactivar a funcionalidade de abreviaciÃ³n dos nomes dos "
 "cartafoles na barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11257,11 +11262,11 @@ msgstr ""
 "Indica se debe retroceder no agrupamento de conversas polo asunto cando as "
 "mensaxes non conteÃ±en cabeceiras Â«En resposta aÂ» ou Â«ReferenciasÂ»."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:233
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Indica se ordenar as conversa pola Ãºltima mensaxe que aparece"
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -11272,11 +11277,11 @@ msgstr ""
 "filtrado Â«ReencamiÃ±ar aÂ» e aproximadamente un minuto despois da invocaciÃ³n "
 "da Ãºltima acciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:235
 msgid "Width of the message-list pane"
 msgstr "Largura do panel da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:236
 msgid "Width of the message-list pane."
 msgstr "Largura do panel da lista de mensaxes."
 
@@ -11285,7 +11290,7 @@ msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
 #: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1044
+#: ../modules/mail/e-mail-shell-view.c:1047
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
@@ -11327,7 +11332,7 @@ msgid "From"
 msgstr "De"
 
 #: ../mail/importers/evolution-mbox-importer.c:452
-#: ../shell/e-shell-utils.c:253
+#: ../shell/e-shell-utils.c:217
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
@@ -11424,450 +11429,470 @@ msgstr "Engadir unha sinatura _novaâ?¦"
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Asinar sem_pre as mensaxes saÃntes cando se use esta conta"
 
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+"TÃ³dolos correos electrÃ³nicos novos con cabeceiras que coincidan co contido "
+"dado filtraranse automaticamente como SPAM"
+
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 "Per_mitir que unha lista de correo redirixa as respostas privadas de novo Ã¡ "
 "lista"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Ci_frar tamÃ©n para min mesmo cando envÃe correo cifrado"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar _sempre unha copia de carbÃ³n (Cc) a:"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre unha copia de carbÃ³n _oculta (Cco) a:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confia_r sempre nas chaves do meu anel de chaves ao cifrar"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Cifrar sempre para min _mesmo ao enviar correo cifrado"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Requirir sempre a confirmaciÃ³n de lec_tura"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr "Aplicar as mesmas opciÃ³ns de _visualizaciÃ³n para todos os cartafoles"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:15
 #: ../modules/addressbook/addressbook-config.c:1018
 msgid "Authentication"
 msgstr "AutenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "Inserir imaxes de _emoticonas automaticamente"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "Conxunto de ca_racteres:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "Comprobar os tipos compatÃb_eis"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "Comprobar as cabeceiras personalizada_s para detectar correo lixo"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new _messages on start"
 msgstr "Comprobar se hai _mensaxes novas ao iniciar"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Comprobar se hai mensa_xes novas nas contas activas"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar as _mensaxes entrantes para detectar correo lixo"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "Comprobar a ortografÃa men_tres escribe"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "Limp_ar"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "Limpa_r"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "Cor para as palabras escritas incorrecta_mente:"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "Escribir unha mensaxe"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 #: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "ConfiguraciÃ³n"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar antes de e_xpurgar un cartafol"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Confirmations"
 msgstr "ConfirmaciÃ³ns"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:155
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Date/Time Format"
 msgstr "Formato da data e da hora"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Default Behavior"
 msgstr "Comportamento predeterminado:"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "CodificaciÃ³_n de caracteres predeterminada:"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "Eliminar o correo"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar o correo lixo ao saÃ_r"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Asinar dixitalmente as mensaxes saÃnt_es (predeterminado)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "Mostrar as cabeceiras da mensaxe"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 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:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "Non citar"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "Carta_fol dos borradores:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "Baleirar os cartafoles do lixo ao _saÃr"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_frado:"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "Cifrar as mensaxes saÃn_tes (predeterminado)"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "F_all back to threading messages by subject"
 msgstr "Volver agrupar as mensaxes polo _asunto"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed Width Font:"
 msgstr "Tipo de l_etra de largura fixa:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "Formatar as mensaxes en _HTML"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "A resposta ao grupo vai unicamente Ã¡ lista de correo, se Ã© posÃbel"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
+msgid "Header content"
+msgstr "Contido da cabeceira"
+
+#: ../mail/mail-config.ui.h:57
+msgid "Header name"
+msgstr "Nome da cabeceira"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "Cabeceiras"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "Realzar as _citas con"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "Ignorar Â«Responder a:Â» para as listas de correo"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "Inseridas"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "Inseridas (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "TÃ¡boa de idiomas"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "Cargando as imaxes"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "TÃ¡boa de cabeceiras de correo"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "LocalizaciÃ³n da caixa de correo"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "VisualizaciÃ³n das mensaxes"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "ConfirmaciÃ³ns de lectura das mensaxes"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "Sen _proxy para:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Ignorarase a opciÃ³n se se atopa algunha coincidencia para as cabeceiras "
 "personalizadas do correo lixo."
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "InformaciÃ³n opcional"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "Organi_zaciÃ³n:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da _chave PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "Con_trasinal:"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:79
 #: ../modules/calendar/e-calendar-preferences.ui.h:23
 msgid "Pick a color"
 msgstr "Seleccionar unha cor"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "Proxy Settings"
 msgstr "Axustes da proxy"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "Le_mbrar o contrasinal"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "Lembrar o _contrasinal"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
 msgid "Replies and Forwards"
 msgstr "Respostas e reencamiÃ±amentos"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Required Information"
 msgstr "InformaciÃ³n solicitada"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL non Ã© compatÃbel con esta versiÃ³n do Evolution"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "B_uscar a fotografÃa do remitente sÃ³ nas axendas de enderezos locais"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "S_eleccionarâ?¦"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "_Enviar as confirmaciÃ³ns de lectura das mensaxes:"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "Tipo de letra es_tÃ¡ndar:"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "Seleccionar o tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "Seleccionar o tipo de letra de largura variÃ¡bel para HTML"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "FotografÃa do remitente"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:106
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Enviar unha resposta _privada Ã¡ mensaxes da lista de correo"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:108
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Enviar unha mensaxe con _destinatarios non inseridos como enderezos de correo"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:110
 msgid "Sending a message with an _empty subject line"
 msgstr "Enviar unha m_ensaxe co asunto baleiro"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:112
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Enviar unha mensaxe sÃ³ con destinatarios _Bcc definidos"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Enviar unha resposta a un grande _nÃºmero de destinatarios"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol das _mensaxes enviadas:"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor solicita autenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
 msgstr "ConfiguraciÃ³n do servidor"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:119
+msgid "Set custom junk header"
+msgstr "Estabelecer cabeceira de SPAM personalizada"
+
+#: ../mail/mail-config.ui.h:120
 msgid "Si_gning algorithm:"
 msgstr "Algoritmo da si_natura:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "Certificado de si_natura:"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "Sinat_ura:"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:125
 msgid "Signing _algorithm:"
 msgstr "_Algoritmo da sinatura:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:126
 msgid "Special Folders"
 msgstr "Cartafoles especiais"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "ComprobaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "Comezar a escribir ao final da respos_ta"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:129
 msgid "Start up"
 msgstr "Iniciar"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -11875,7 +11900,7 @@ msgstr ""
 "Esta lista de idiomas mostra unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11885,7 +11910,7 @@ msgstr ""
 "sinatura. O nome que indique usarase\n"
 "sÃ³ a efectos de visualizaciÃ³n. "
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -11893,7 +11918,7 @@ msgstr ""
 "Para evitar accidentes co correo e outras incomodidades pedir a confirmaciÃ³n "
 "antes de realizar as seguintes acciÃ³ns marcadas:"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11901,145 +11926,153 @@ msgstr ""
 "Indique o nome polo que desexa identificar esta conta.\n"
 "Por exemplo: Â«TraballoÂ» ou Â«PersoalÂ»"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "Nom_e do usuario:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:141
 msgid "User _Name:"
 msgstr "_Nome do usuario:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "_Engadir unha sinatura"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "C_argar sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:145
 msgid "_Default junk plugin:"
 msgstr "Engadi_do predeterminado para o correo lixo:"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "ConexiÃ³n _directa a Internet"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:147
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "Non asinar as solicitudes _de reuniÃ³n (para a compatibilidade co Outlook)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:148
 msgid "_Forward style:"
 msgstr "Estilo do _reencamiÃ±amento:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:149
 msgid "_Junk Folder:"
 msgstr "Cartafol do coreo _lixo:"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:150
 msgid "_Keep signature above the original message on replying"
 msgstr "Ao responder _manter a sinatura por riba da mensaxe orixinal"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:151
 msgid "_Languages"
 msgstr "I_diomas"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:152
 msgid "_Load images only in messages from contacts"
 msgstr "Ca_rgar as imaxes sÃ³ nas mensaxes dos contactos"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:153
 msgid "_Lookup in local address book only"
 msgstr "Buscar sÃ³ nas axendas de enderezos _locais"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:154
 msgid "_Make this my default account"
 msgstr "Facer desta a _miÃ±a conta predeterminada"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:155
 msgid "_Manual proxy configuration:"
 msgstr "ConfiguraciÃ³n _manual do proxy:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:157
 msgid "_Never load images from the Internet"
 msgstr "_Non cargar as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:158
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "_Porto:"
+
+#: ../mail/mail-config.ui.h:160
 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:156
+#: ../mail/mail-config.ui.h:161
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:162
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:163
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _segura:"
 
-#: ../mail/mail-config.ui.h:160 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:167
 msgid "_Show animated images"
 msgstr "Mo_strar as imaxes animadas"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:168
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar a fotografÃa do remitente na previsualizaciÃ³n das mensaxes"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:169
 msgid "_Trash Folder:"
 msgstr "Cartafo_l do lixo:"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:170
 msgid "_Use Secure Connection:"
 msgstr "_Usar unha conexiÃ³n segura:"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:171
 msgid "_Use system defaults"
 msgstr "_Usar as predefiniciÃ³ns do sistema"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:172
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
 
-#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:175
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:176
 msgid "description"
 msgstr "descriciÃ³n"
 
+#: ../mail/mail-config.ui.h:177
+msgid "gtk-ok"
+msgstr "gtk-ok"
+
 #: ../mail/mail-dialogs.ui.h:1
 msgid "All active remote folders"
 msgstr "Todos os cartafoles remotos activos"
@@ -12136,144 +12169,139 @@ msgstr "_Marca:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Marque is_to para aceptar o acordo de licenza"
 
-#: ../mail/mail-folder-cache.c:789
+#: ../mail/mail-folder-cache.c:795
 #, c-format
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
 
-#: ../mail/mail-ops.c:85
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../mail/mail-ops.c:226
+#: ../mail/mail-ops.c:227
 msgid "Fetching Mail"
 msgstr "Recibindo o correo"
 
-#: ../mail/mail-ops.c:785
+#: ../mail/mail-ops.c:818
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:864
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Produciuse un fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
+#: ../mail/mail-ops.c:866 ../mail/mail-send-recv.c:814
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:868 ../mail/mail-send-recv.c:816
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:975
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a Â«%sÂ»"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:975
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1062
+#: ../mail/mail-ops.c:1096
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Examinando os cartafoles de Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1178
+#: ../mail/mail-ops.c:1212
 msgid "Forwarded messages"
 msgstr "Mensaxes reencamiÃ±adas"
 
-#: ../mail/mail-ops.c:1295
+#: ../mail/mail-ops.c:1329
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Obtendo a informaciÃ³n da cota do cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1370
-#, c-format
-msgid "Opening store '%s'"
-msgstr "Abrindo o almacenamento Â«%sÂ»"
-
-#: ../mail/mail-ops.c:1446
+#: ../mail/mail-ops.c:1403
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Eliminando o cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1566
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gardando o cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1678
+#: ../mail/mail-ops.c:1638
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expurgando e gardando a conta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1679
+#: ../mail/mail-ops.c:1639
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Gardando a conta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1697
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando o cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1901
+#: ../mail/mail-ops.c:1867
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Expurgando o cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:1934
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo de Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1974
+#: ../mail/mail-ops.c:1935
 msgid "Local Folders"
 msgstr "Cartafoles locais"
 
-#: ../mail/mail-ops.c:2147
+#: ../mail/mail-ops.c:2100
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Descargando %d mensaxe"
 msgstr[1] "Descargando %d mensaxes"
 
-#: ../mail/mail-ops.c:2240
+#: ../mail/mail-ops.c:2193
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
-#: ../mail/mail-ops.c:2336
+#: ../mail/mail-ops.c:2289
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "Produciuse un erro ao gardar as mensaxes en: %s:\n"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2364
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta Â«%sÂ» para o modo sen conexiÃ³n"
 
-#: ../mail/mail-ops.c:2502
+#: ../mail/mail-ops.c:2454
 msgid "Checking Service"
 msgstr "Comprobando o servizo"
 
-#: ../mail/mail-ops.c:2582
+#: ../mail/mail-ops.c:2532
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Desconectando %s"
 
-#: ../mail/mail-ops.c:2639
+#: ../mail/mail-ops.c:2589
 #, c-format
 msgid "Removing attachments"
 msgstr "Eliminando os anexos"
 
-#: ../mail/mail-ops.c:2686
+#: ../mail/mail-ops.c:2636
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Eliminouse o ficheiro Â«%sÂ»."
@@ -12282,33 +12310,33 @@ msgstr "Eliminouse o ficheiro Â«%sÂ»."
 msgid "Canceling..."
 msgstr "Cancelandoâ?¦"
 
-#: ../mail/mail-send-recv.c:436
+#: ../mail/mail-send-recv.c:437
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir o correo"
 
-#: ../mail/mail-send-recv.c:452
+#: ../mail/mail-send-recv.c:453
 msgid "Cancel _All"
 msgstr "Cancel_ar todo"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:577
 msgid "Updating..."
 msgstr "Actualizandoâ?¦"
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:577 ../mail/mail-send-recv.c:670
 msgid "Waiting..."
 msgstr "Agardandoâ?¦"
 
-#: ../mail/mail-send-recv.c:903
+#: ../mail/mail-send-recv.c:929
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando se hai correo novo"
 
-#: ../mail/mail-tools.c:69
+#: ../mail/mail-tools.c:71
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Non foi posÃbel crear o cartafol spool Â«%sÂ»: %s"
 
-#: ../mail/mail-tools.c:102
+#: ../mail/mail-tools.c:105
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Tentativa de movemail sobre unha fonte non-mbox Â«%sÂ»"
@@ -12342,7 +12370,7 @@ msgstr "Actualizando os cartafoles de busca para Â«%sÂ»"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:718
+#: ../mail/mail-vfolder.c:719
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12360,11 +12388,11 @@ msgstr[1] ""
 "Â«%sÂ» modificÃ¡ronse debido a que se eliminou o cartafol\n"
 "Â«%sÂ»."
 
-#: ../mail/mail-vfolder.c:1297
+#: ../mail/mail-vfolder.c:1304
 msgid "Edit Search Folder"
 msgstr "Editar o cartafol de busca"
 
-#: ../mail/mail-vfolder.c:1408
+#: ../mail/mail-vfolder.c:1415
 msgid "New Search Folder"
 msgstr "Novo cartafol de busca"
 
@@ -12577,23 +12605,19 @@ msgstr "Pechar a xanela da mensaxe."
 msgid "Could not save signature file."
 msgstr "Non foi posÃbel gardar o ficheiro da sinatura."
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Desexa eliminar as mensaxes do cartafol de busca Â«{0}Â»?"
-
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Disable"
 msgstr "_Non desactivar"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Send"
 msgstr "_Non enviar"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Synchronize"
 msgstr "_Non sincronizar"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -12601,34 +12625,34 @@ msgstr ""
 "Desexa sincronizar localmente os cartafoles que estÃ¡n marcados para o uso "
 "sen conexiÃ³n?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Desexa marcar todas as mensaxes como lidas?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Desexa gardar as modificaciÃ³ns?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Introduza o contrasinal."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Produciuse un erro ao cargar as definiciÃ³ns dos filtros."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Produciuse un erro ao efectuar a operaciÃ³n."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Produciuse un erro ao {0}."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -12647,32 +12671,32 @@ msgstr ""
 "Se escolle a migraciÃ³n comprobe con anterioridade que haxa suficiente espazo "
 "libre no seu disco. "
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid "Evolution's local mail format has changed."
 msgstr "O formato de correo electrÃ³nico local de Evolution cambiou."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to unsubscribe from folder."
 msgstr "Produciuse un fallo ao eliminar a subscriciÃ³n do cartafol."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "File exists but cannot overwrite it."
 msgstr "O ficheiro existe pero non Ã© posÃbel sobrescribilo."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "File exists but is not a regular file."
 msgstr "O ficheiro existe pero non Ã© un ficheiro normal."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "O cartafol Â«{0}Â» non contÃ©n ningunha mensaxe duplicada."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Se continÃºa non poderÃ¡ recuperar estas mensaxes."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12680,16 +12704,16 @@ msgstr ""
 "Se elimina o cartafol, todo o seu contido e o dos seus subcartafoles "
 "eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Se elimina o cartafol, eliminarase permanentemente todo o seu contido."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Se continÃºa, as contas proxy eliminaranse permanentemente."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12697,11 +12721,11 @@ msgstr ""
 "Se continÃºa, a informaciÃ³n da conta e toda a\n"
 "informaciÃ³n do proxy eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Se continÃºa, a informaciÃ³n da conta eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -12709,23 +12733,23 @@ msgstr ""
 "Se sae do aplicativo, estas mensaxes non se enviarÃ¡n atÃ© que o Evolution se "
 "inicie de novo."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:77
 msgid "Invalid authentication"
 msgstr "A autenticaciÃ³n non Ã© vÃ¡lida"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:78
 msgid "Mail Deletion Failed"
 msgstr "Produciuse un fallo na eliminaciÃ³n do correo"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -12737,6 +12761,17 @@ msgstr ""
 "os destinatarios na sÃºa mensaxe. Para evitar isto deberÃa engadir polo menos "
 "un destinatario Â«Para:Â» ou Â«CC:Â»."
 
+#: ../mail/mail.error.xml.h:81
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"As mensaxes mostradas nos cartafoles de busca non son copias. Se os borra do "
+"cartafol de busca borraranse do cartafol ou cartafoles nos que estea "
+"fisicamente.\n"
+"EstÃ¡ seguro de que desexa facer isto?"
+
 #: ../mail/mail.error.xml.h:82
 msgid "Missing folder."
 msgstr "Falta o cartafol."
@@ -12891,6 +12926,10 @@ msgid "The script file must exist and be executable."
 msgstr "O ficheiro do script debe existir e ser executÃ¡bel."
 
 #: ../mail/mail.error.xml.h:119
+msgid "These messages are not copies."
+msgstr "Estes mensaxes non son copias."
+
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12899,7 +12938,7 @@ msgstr ""
 "se Ã© necesario, vaia ao editor de cartafoles de busca para engadilo "
 "explicitamente."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -12907,13 +12946,13 @@ msgstr ""
 "Non Ã© posÃbel enviar esta mensaxe porque a conta que escolleu para enviala "
 "non estÃ¡ activada"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Non Ã© posÃbel enviar esta mensaxe porque non indicou ningÃºn destinatario"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -12921,11 +12960,11 @@ msgstr ""
 "Este servidor non Ã© compatÃbel con este tipo de autenticaciÃ³n e quizais non "
 "permita ningÃºn tipo de autenticaciÃ³n."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:125
 msgid "This signature has been changed, but has not been saved."
 msgstr "Modificouse esta sinatura pero non se gardou."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -12933,15 +12972,15 @@ msgstr ""
 "Isto marcarÃ¡ todas as mensaxes como lidas no cartafol seleccionado e nos "
 "seus subcartafoles."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:127
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Isto marcarÃ¡ todas as mensaxes como lidas no cartafol seleccionado."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:128
 msgid "Unable to connect to the GroupWise server."
 msgstr "Non foi posÃbel conectar co servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -12949,28 +12988,22 @@ msgstr ""
 "Non Ã© posÃbel abrir o cartafol de borradores desta conta. Desexa usar no seu "
 "lugar o cartafol de borradores do sistema?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:130
 msgid "Unable to read license file."
 msgstr "Non Ã© posÃbel ler o ficheiro da licenza."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:131
+msgid "Unable to retrieve message."
+msgstr "Non foi posÃbel obter a mensaxe."
+
+#: ../mail/mail.error.xml.h:132
 msgid "Use _Default"
 msgstr "Usar o pre_definido"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:133
 msgid "Use default drafts folder?"
 msgstr "Desexa usar o cartafol de borradores predeterminado?"
 
-#: ../mail/mail.error.xml.h:132
-msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
-"Do you really want to do this?"
-msgstr ""
-"Aviso: ao eliminar as mensaxes do cartafol de busca eliminaranse tamÃ©n as "
-"mensaxes reais dun dos seus cartafoles locais ou remotos.\n"
-"EstÃ¡ seguro de que desexa facer isto?"
-
 #: ../mail/mail.error.xml.h:134
 msgid "Would you like to close the message window?"
 msgstr "Desexa pechar a xanela da mensaxe?"
@@ -13096,89 +13129,93 @@ msgstr "_Sincronizar"
 msgid "_Yes"
 msgstr "_Si"
 
-#: ../mail/message-list.c:1215
+#: ../mail/mail.error.xml.h:162
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1214
 msgid "Unseen"
 msgstr "Sen ler"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1215
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1216
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1217
 msgid "Forwarded"
 msgstr "ReencamiÃ±ada"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1218
 msgid "Multiple Unseen Messages"
 msgstr "MÃºltiples mensaxes sen ler"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1219
 msgid "Multiple Messages"
 msgstr "MÃºltiples mensaxes"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1223
 msgid "Lowest"
 msgstr "A mÃ¡is baixa"
 
-#: ../mail/message-list.c:1225
+#: ../mail/message-list.c:1224
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1229
+#: ../mail/message-list.c:1228
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1230
+#: ../mail/message-list.c:1229
 msgid "Highest"
 msgstr "A mÃ¡is alta"
 
-#: ../mail/message-list.c:1849 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1848 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1856 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1855 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoxe Ã¡s %l:%M %p"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1864
 msgid "Yesterday %l:%M %p"
 msgstr "Onte Ã¡s %l:%M %p"
 
 # (pofilter) variables: do not translate: %a, %l, %p
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:1876
 msgid "%a %l:%M %p"
 msgstr "O %a Ã¡s %l:%M %p"
 
 # (pofilter) variables: do not translate: %b, %l, %p
-#: ../mail/message-list.c:1885
+#: ../mail/message-list.c:1884
 msgid "%b %d %l:%M %p"
 msgstr "O %b %d Ã¡s %l:%M %p"
 
 # (pofilter) variables: do not translate: %b
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1886
 msgid "%b %d %Y"
 msgstr "O %b %d de %Y"
 
-#: ../mail/message-list.c:2672
+#: ../mail/message-list.c:2671
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensaxes visÃbeis"
 
-#: ../mail/message-list.c:2830 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2829 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensaxes"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4506 ../mail/message-list.c:4930
+#: ../mail/message-list.c:4505 ../mail/message-list.c:4919
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: ../mail/message-list.c:4745
+#: ../mail/message-list.c:4738
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13186,7 +13223,7 @@ msgstr ""
 "Non hai mensaxes que satisfagan os seus criterios de busca. Limpe a busca no "
 "menÃº Buscar->Limpar ou cÃ¡mbiea."
 
-#: ../mail/message-list.c:4747
+#: ../mail/message-list.c:4740
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes neste cartafol."
 
@@ -13444,7 +13481,7 @@ msgstr "Indica se mostrar o panel de previsualizaciÃ³n."
 
 #. 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:161
-#: ../modules/mail/em-mailer-prefs.c:1140
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "_Table column:"
 msgstr "Columna da _tÃ¡boa:"
 
@@ -13468,7 +13505,7 @@ msgid "_Contact"
 msgstr "_Contacto"
 
 #: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-view-actions.c:766
 msgid "Create a new contact"
 msgstr "Crear un contacto novo"
 
@@ -13478,7 +13515,7 @@ msgid "Contact _List"
 msgstr "_Lista de contactos"
 
 #: ../modules/addressbook/e-book-shell-backend.c:285
-#: ../modules/addressbook/e-book-shell-view-actions.c:780
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact list"
 msgstr "Crear unha lista de contactos nova"
 
@@ -13558,155 +13595,140 @@ msgstr "_Renomearâ?¦"
 msgid "Rename the selected address book"
 msgstr "Renomear a axenda de enderezos seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-msgid "S_ave Address Book as vCard"
-msgstr "G_ardar a axenda de enderezos como VCard"
-
 #: ../modules/addressbook/e-book-shell-view-actions.c:724
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr ""
-"Gardar os contactos da axenda de enderezos seleccionada como unha VCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
 msgid "Stop loading"
 msgstr "Deter a carga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "_Copy Contact To..."
 msgstr "_Copiar o contacto aâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
 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:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Delete Contact"
 msgstr "E_liminar o contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "_Find in Contact..."
 msgstr "_Buscar no contactoâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Search for text in the displayed contact"
 msgstr "Buscar un texto no contacto mostrado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Forward Contact..."
 msgstr "_ReencamiÃ±ar o contactoâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
 msgid "Send selected contacts to another person"
 msgstr "Enviar os contactos seleccionados a outra persoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Move Contact To..."
 msgstr "_Mover o contacto aâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:766
+#: ../modules/addressbook/e-book-shell-view-actions.c:759
 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:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_New Contact..."
 msgstr "Contacto _novoâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "New Contact _List..."
 msgstr "_Lista de contactos novaâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "_Open Contact"
 msgstr "Abrir _o contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:787
+#: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Send Message to Contact..."
 msgstr "_Enviar unha mensaxe ao contactoâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
 msgid "Send a message to the selected contacts"
 msgstr "Enviar unha mensaxe aos contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1502
+#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-actions.c:1495
 #: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Actions"
 msgstr "_AcciÃ³ns"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
 #: ../modules/calendar/e-memo-shell-view-actions.c:663
 #: ../modules/calendar/e-task-shell-view-actions.c:815
 #: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "_Preview"
 msgstr "_PrevisualizaciÃ³n"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/addressbook/e-book-shell-view-actions.c:810
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 #: ../modules/calendar/e-memo-shell-view-actions.c:676
 #: ../modules/calendar/e-task-shell-view-actions.c:828
 msgid "_Delete"
 msgstr "E_liminar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-msgid "_Save as vCard..."
-msgstr "_Gardar como vCardâ?¦"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/addressbook/e-book-shell-view-actions.c:846
 msgid "Contact _Preview"
 msgstr "_PrevisualizaciÃ³n do contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:848
 msgid "Show contact preview window"
 msgstr "Mostrar a xanela de previsualizaciÃ³n de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
 #: ../modules/calendar/e-memo-shell-view-actions.c:733
 #: ../modules/calendar/e-task-shell-view-actions.c:897
 #: ../modules/mail/e-mail-shell-view-actions.c:1418
 msgid "_Classic View"
 msgstr "VisualizaciÃ³n _clÃ¡sica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "Show contact preview below the contact list"
 msgstr "Mostrar a previsualizaciÃ³n do contacto embaixo da lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
 #: ../modules/calendar/e-memo-shell-view-actions.c:740
 #: ../modules/calendar/e-task-shell-view-actions.c:904
 #: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "_Vertical View"
 msgstr "VisualizaciÃ³n _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:876
 msgid "Show contact preview alongside the contact list"
 msgstr "Mostrar a previsualizaciÃ³n do contacto ao carÃ³n da lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1662
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 #: ../modules/calendar/e-memo-shell-view-actions.c:750
 #: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Any Category"
 msgstr "Calquera categorÃa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1676
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
 #: ../modules/calendar/e-memo-shell-view-actions.c:757
 #: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Unmatched"
 msgstr "Sen coincidencias"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/calendar/e-cal-shell-view-actions.c:1675
 #: ../modules/calendar/e-memo-shell-view-actions.c:767
 #: ../modules/calendar/e-task-shell-view-actions.c:966
 #: ../modules/mail/e-mail-shell-view-actions.c:1501
@@ -13714,19 +13736,34 @@ msgstr "Sen coincidencias"
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Print all shown contacts"
 msgstr "Imprimir os contactos mostrados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "Preview the contacts to be printed"
 msgstr "Previsualizar os contactos que se van imprimir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:948
 msgid "Print selected contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:963
+msgid "S_ave Address Book as vCard"
+msgstr "G_ardar a axenda de enderezos como VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
+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:971
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
+msgid "_Save as vCard..."
+msgstr "_Gardar como vCardâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "Save selected contacts as a vCard"
 msgstr "Gardar os contactos seleccionados como unha VCard"
 
@@ -13847,10 +13884,6 @@ msgstr "_Procurar as bases de busca posÃbeis"
 msgid "_Login method:"
 msgstr "MÃ©todo de _inicio de sesiÃ³n:"
 
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "_Porto:"
-
 #: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "Ã?mbito da bu_sca:"
@@ -13999,7 +14032,7 @@ msgid "Wee_k starts on:"
 msgstr "A _semana comeza en:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Work Week"
 msgstr "Semana laboral"
 
@@ -14731,7 +14764,7 @@ msgstr "_Importar Ã¡s tarefas"
 #: ../modules/calendar/e-cal-shell-backend.c:107
 #: ../modules/calendar/e-cal-shell-migrate.c:194
 #: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:149
+#: ../modules/calendar/e-memo-shell-migrate.c:148
 #: ../modules/calendar/e-task-shell-backend.c:94
 #: ../modules/calendar/e-task-shell-migrate.c:160
 msgid "On The Web"
@@ -14786,7 +14819,7 @@ msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
 #: ../modules/calendar/e-cal-shell-backend.c:750
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../plugins/itip-formatter/itip-formatter.c:2810
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
@@ -14996,95 +15029,95 @@ msgid "_Reply"
 msgstr "_Responder"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1472
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-msgid "Save as iCalendar..."
-msgstr "Gardar como vCardâ?¦"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "_Schedule Meeting..."
 msgstr "_Programar unha reuniÃ³nâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1474
 msgid "Converts an appointment to a meeting"
 msgstr "Converte una cita nunha reuniÃ³n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_erter en citaâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../modules/calendar/e-cal-shell-view-actions.c:1481
 msgid "Converts a meeting to an appointment"
 msgstr "Converte unha reuniÃ³n nunha cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Quit"
 msgstr "SaÃr"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1606
 msgid "Day"
 msgstr "DÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1608
 msgid "Show one day"
 msgstr "Mostrar un dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Show as list"
 msgstr "Mostrar como unha lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Show one week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 msgid "Show one work week"
 msgstr "Mostrar unha semana laboral"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos prÃ³ximos sete dÃas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1700
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Description contains"
 msgstr "A descriciÃ³n contÃ©n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1707
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
 #: ../modules/calendar/e-memo-shell-view-actions.c:788
 #: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Summary contains"
 msgstr "O resumo contÃ©n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1708
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1715
 msgid "Preview the calendar to be printed"
 msgstr "Previsualizar o calendario que se vai imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1737
+#: ../modules/calendar/e-cal-shell-view-memopad.c:291
+msgid "Save as iCalendar..."
+msgstr "Gardar como vCardâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1814
 msgid "Go To"
 msgstr "Ir a"
 
@@ -15123,7 +15156,7 @@ msgstr "Ver a nota seleccionada"
 msgid "Open _Web Page"
 msgstr "Abrir a pÃ¡xina _web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:290
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
 #: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the selected memo"
 msgstr "Imprimir a nota seleccionada"
@@ -15182,17 +15215,17 @@ msgstr "_Abrir unha tarefa"
 msgid "View the selected task"
 msgstr "Ver a tarefa seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+msgid "Print the selected task"
+msgstr "Imprimir a tarefa seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:378
 #: ../modules/calendar/e-memo-shell-view-actions.c:829
 #: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "_Save as iCalendar..."
 msgstr "Gardar como iCalendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
-msgid "Print the selected task"
-msgstr "Imprimir a tarefa seleccionada"
-
 #: ../modules/calendar/e-calendar-preferences.c:437
 msgid "Selected Calendars for Alarms"
 msgstr "Calendarios seleccionados para alarmas"
@@ -15384,6 +15417,10 @@ msgstr ""
 "\n"
 "EstÃ¡ seguro de que desexa eliminalas?"
 
+#: ../modules/calendar/e-task-shell-view-actions.c:576
+msgid "Do not ask me again"
+msgstr "Non preguntar de novo."
+
 #: ../modules/calendar/e-task-shell-view-actions.c:694
 msgid "_Delete Task"
 msgstr "E_liminar a tarefa"
@@ -15509,42 +15546,42 @@ msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:184
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaxe de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:185
+#: ../modules/mail/e-mail-shell-backend.c:186
 msgid "Compose a new mail message"
 msgstr "Escribir unha mensaxe de correo nova"
 
-#: ../modules/mail/e-mail-shell-backend.c:193
+#: ../modules/mail/e-mail-shell-backend.c:194
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Carta_fol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:196
 msgid "Create a new mail folder"
 msgstr "Crear un cartafol de correo novo"
 
-#: ../modules/mail/e-mail-shell-backend.c:494
+#: ../modules/mail/e-mail-shell-backend.c:495
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:503
 msgid "Mail Preferences"
 msgstr "Preferencias de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:510
+#: ../modules/mail/e-mail-shell-backend.c:511
 msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:518
+#: ../modules/mail/e-mail-shell-backend.c:519
 msgid "Network Preferences"
 msgstr "Preferencias de rede"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1064
-#: ../modules/mail/e-mail-shell-view.c:953
+#: ../modules/mail/e-mail-shell-view.c:956
 msgid "_Disable Account"
 msgstr "_Desactivar a conta"
 
@@ -15901,38 +15938,38 @@ msgstr[1] "%d en total"
 msgid "Trash"
 msgstr "Lixo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1600
+#: ../modules/mail/e-mail-shell-view-private.c:1594
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ../modules/mail/e-mail-shell-view.c:563
+#: ../modules/mail/e-mail-shell-view.c:564
 msgid "All Account Search"
 msgstr "Busca en todas as contas"
 
-#: ../modules/mail/e-mail-shell-view.c:746
+#: ../modules/mail/e-mail-shell-view.c:748
 msgid "Account Search"
 msgstr "Busca na conta"
 
-#: ../modules/mail/e-mail-shell-view.c:951
+#: ../modules/mail/e-mail-shell-view.c:954
 msgid "Proxy _Logout"
 msgstr "_Terminar a sesiÃ³n proxy"
 
-#: ../modules/mail/em-account-prefs.c:215
+#: ../modules/mail/em-account-prefs.c:213
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
-#: ../modules/mail/em-account-prefs.c:264
+#: ../modules/mail/em-account-prefs.c:262
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../modules/mail/em-composer-prefs.c:502
+#: ../modules/mail/em-composer-prefs.c:490
 #: ../modules/plugin-manager/evolution-plugin-manager.c:356
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../widgets/misc/e-account-tree-view.c:220
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:494
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
@@ -15952,50 +15989,38 @@ msgstr "Unha vez Ã¡ semana"
 msgid "Once per month"
 msgstr "Unha vez ao mes"
 
-#: ../modules/mail/em-mailer-prefs.c:174
-msgid "Add Custom Junk Header"
-msgstr "Engadir unha cabeceira personalizada para o correo lixo"
-
-#: ../modules/mail/em-mailer-prefs.c:182
-msgid "Header Name:"
-msgstr "Nome da cabeceira:"
-
-#: ../modules/mail/em-mailer-prefs.c:183
-msgid "Header Value Contains:"
-msgstr "O valor da cabeceira contÃ©n:"
-
-#: ../modules/mail/em-mailer-prefs.c:283
+#: ../modules/mail/em-mailer-prefs.c:288
 msgid "Header"
 msgstr "Cabeceira"
 
-#: ../modules/mail/em-mailer-prefs.c:287
+#: ../modules/mail/em-mailer-prefs.c:292
 msgid "Contains Value"
 msgstr "ContÃ©n o valor"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:698 ../modules/mail/em-mailer-prefs.c:771
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "O engadido %s estÃ¡ dispoÃ±Ãbel e o binario instalado."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:775
+#: ../modules/mail/em-mailer-prefs.c:706 ../modules/mail/em-mailer-prefs.c:780
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "O engadido %s non estÃ¡ dispoÃ±Ãbel. Comprobe se o paquete estÃ¡ instalado."
 
-#: ../modules/mail/em-mailer-prefs.c:739
+#: ../modules/mail/em-mailer-prefs.c:744
 msgid "No junk plugin available"
 msgstr "Non hai dispoÃ±Ãbel un engadido para o correo lixo"
 
 #. 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:1142
+#: ../modules/mail/em-mailer-prefs.c:1147
 msgid "_Date header:"
 msgstr "_Cabeceira da data:"
 
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/mail/em-mailer-prefs.c:1148
 msgid "Show _original header value"
 msgstr "Mostrar o valor _orixinal da cabeceira"
 
@@ -16142,13 +16167,12 @@ msgstr ""
 "Lista de indicios para que o engadido de aviso de anexos busque no corpo da "
 "mensaxe"
 
-#. Check buttons
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
+#: ../plugins/attachment-reminder/attachment-reminder.c:121
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:411
+#: ../plugins/attachment-reminder/attachment-reminder.c:453
+#: ../plugins/templates/templates.c:415
 msgid "Keywords"
 msgstr "Palabras chave"
 
@@ -16165,8 +16189,8 @@ msgid "Message has no attachments"
 msgstr "A mensaxe non contÃ©n ningÃºn anexo"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add attachment..."
-msgstr "Anex_arâ?¦"
+msgid "_Add Attachment..."
+msgstr "Eng_adir anexoâ?¦"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
@@ -16188,25 +16212,25 @@ msgstr "Son inserido"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Reproducir os anexos de son directamente nas mensaxes de correo."
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:186
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccionar o nome do ficheiro de copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:216
+#: ../plugins/backup-restore/backup-restore.c:219
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:242
+#: ../plugins/backup-restore/backup-restore.c:245
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccionar o nome do ficheiro da copia de seguranza do Evolution para "
 "restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:255
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution despois de restabelecer"
 
-#: ../plugins/backup-restore/backup-restore.c:323
+#: ../plugins/backup-restore/backup-restore.c:326
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16216,35 +16240,35 @@ msgstr ""
 "restaurar todos os correos, calendarios, tarefas, notas e contactos. TamÃ©n "
 "restabelecerÃ¡ todas as configuraciÃ³ns persoais, filtros de correo, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:330
+#: ../plugins/backup-restore/backup-restore.c:333
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar Evolution desde a copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:337
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccionar o arquivo do Evolution para restabelecer:"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:343
 msgid "Choose a file to restore"
 msgstr "Escoller un ficheiro para restabelecer"
 
-#: ../plugins/backup-restore/backup-restore.c:348
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Restore from backup"
 msgstr "Restabelecer desde unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:386
+#: ../plugins/backup-restore/backup-restore.c:389
 msgid "_Back up Evolution Data..."
 msgstr "Fa_cer unha copia de seguranza dos datos do Evolutionâ?¦"
 
-#: ../plugins/backup-restore/backup-restore.c:388
+#: ../plugins/backup-restore/backup-restore.c:391
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Facer unha copia de seguranza dos datos e os axustes do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:393
+#: ../plugins/backup-restore/backup-restore.c:396
 msgid "R_estore Evolution Data..."
 msgstr "R_estabelecer os datos do Evolutionâ?¦"
 
-#: ../plugins/backup-restore/backup-restore.c:395
+#: ../plugins/backup-restore/backup-restore.c:398
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Restabelecer os datos e os axustes do Evolution desde un ficheiro"
 
@@ -16923,7 +16947,7 @@ msgid "Key"
 msgstr "Chave"
 
 #: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:417
+#: ../plugins/templates/templates.c:421
 msgid "Values"
 msgstr "Valores"
 
@@ -17140,48 +17164,48 @@ msgstr "Introduza o contrasinal para %s (usuario %s)"
 msgid "Failed to authenticate.\n"
 msgstr "Produciuse un fallo na autenticaciÃ³n.\n"
 
-#: ../plugins/groupwise-features/gw-ui.c:112
+#: ../plugins/groupwise-features/gw-ui.c:114
 msgid "New _Shared Folder..."
 msgstr "Cartafol _compartido novoâ?¦"
 
-#: ../plugins/groupwise-features/gw-ui.c:119
+#: ../plugins/groupwise-features/gw-ui.c:121
 msgid "_Proxy Login..."
 msgstr "Iniciar sesiÃ³n no _proxyâ?¦"
 
-#: ../plugins/groupwise-features/gw-ui.c:170
+#: ../plugins/groupwise-features/gw-ui.c:172
 msgid "Junk Mail Settings..."
 msgstr "Axustes do correo lixoâ?¦"
 
-#: ../plugins/groupwise-features/gw-ui.c:177
+#: ../plugins/groupwise-features/gw-ui.c:179
 msgid "Track Message Status..."
 msgstr "Seguir o estado da mensaxeâ?¦"
 
-#: ../plugins/groupwise-features/gw-ui.c:183
+#: ../plugins/groupwise-features/gw-ui.c:185
 msgid "Retract Mail"
 msgstr "Anular o correo"
 
-#: ../plugins/groupwise-features/gw-ui.c:331
+#: ../plugins/groupwise-features/gw-ui.c:333
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../plugins/groupwise-features/gw-ui.c:338
+#: ../plugins/groupwise-features/gw-ui.c:340
 msgid "Accept Tentatively"
 msgstr "Aceptar provisionalmente"
 
-#: ../plugins/groupwise-features/gw-ui.c:345
+#: ../plugins/groupwise-features/gw-ui.c:347
 msgid "Decline"
 msgstr "Rexeitar"
 
-#: ../plugins/groupwise-features/gw-ui.c:352
+#: ../plugins/groupwise-features/gw-ui.c:354
 msgid "Rese_nd Meeting..."
 msgstr "Ree_nviar a reuniÃ³nâ?¦"
 
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../plugins/groupwise-features/install-shared.c:190
+#: ../plugins/groupwise-features/share-folder-common.c:365
 msgid "Create folder"
 msgstr "Crear un cartafol"
 
-#: ../plugins/groupwise-features/install-shared.c:230
+#: ../plugins/groupwise-features/install-shared.c:242
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17206,11 +17230,11 @@ msgstr ""
 "Prema en 'Aplicar' para instalar o cartafol compartido\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:242
+#: ../plugins/groupwise-features/install-shared.c:254
 msgid "Install the shared folder"
 msgstr "Instalar o cartafol compartido"
 
-#: ../plugins/groupwise-features/install-shared.c:246
+#: ../plugins/groupwise-features/install-shared.c:258
 msgid "Shared Folder Installation"
 msgstr "InstalaciÃ³n do cartafol compartido"
 
@@ -17463,8 +17487,8 @@ msgstr "Nome da conta"
 msgid "Proxy Login"
 msgstr "Iniciar sesiÃ³n no proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy-login.c:209
+#: ../plugins/groupwise-features/proxy-login.c:252
 #: ../plugins/groupwise-features/proxy.c:494
 #: ../plugins/groupwise-features/send-options.c:84
 #, c-format
@@ -17472,22 +17496,22 @@ msgid "%sEnter password for %s (user %s)"
 msgstr "%sIntroducir o contrasinal para %s (usuario %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "A lapela do proxy estarÃ¡ dispoÃ±Ãbel sÃ³ cando a conta estea en liÃ±a."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:704
+#: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "A lapela do proxy estarÃ¡ dispoÃ±Ãbel sÃ³ cando a conta estea activada."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:709
+#: ../plugins/groupwise-features/proxy.c:707
 msgctxt "GW"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy.c:935
+#: ../plugins/groupwise-features/proxy.c:931
 #: ../plugins/groupwise-features/share-folder.c:694
 msgid "Add User"
 msgstr "Engadir un usuario"
@@ -17496,16 +17520,16 @@ msgstr "Engadir un usuario"
 msgid "Advanced send options"
 msgstr "OpciÃ³ns de envÃo avanzadas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:316
+#: ../plugins/groupwise-features/share-folder-common.c:332
 #: ../plugins/groupwise-features/share-folder.c:729
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:333
 msgid "Enter the users and set permissions"
 msgstr "Introduza os usuarios e estabeleza os permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:418
+#: ../plugins/groupwise-features/share-folder-common.c:430
 msgid "Sharing"
 msgstr "Compartir"
 
@@ -17632,148 +17656,148 @@ msgstr "CaracterÃsticas IMAP"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:486
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Produciuse un fallo ao cargar o calendario Â«%sÂ» (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:654
+#: ../plugins/itip-formatter/itip-formatter.c:655
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Unha cita no calendario Â«%sÂ» entra en conflito con esta reuniÃ³n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:691
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizouse a cita no calendario Â«%sÂ»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find any calendars"
 msgstr "Non Ã© posÃbel atopar ningÃºn calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:797
 msgid "Unable to find this meeting in any calendar"
 msgstr "Non Ã© posÃbel atopar esta reuniÃ³n en ningÃºn calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:801
 msgid "Unable to find this task in any task list"
 msgstr "Non Ã© posÃbel atopar esta tarefa en ningunha lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:804
+#: ../plugins/itip-formatter/itip-formatter.c:805
 msgid "Unable to find this memo in any memo list"
 msgstr "Non Ã© posÃbel atopar esta nota en ningunha lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
+#: ../plugins/itip-formatter/itip-formatter.c:881
 msgid "Opening the calendar. Please wait.."
 msgstr "Abrindo o calendario, agardeâ?¦"
 
-#: ../plugins/itip-formatter/itip-formatter.c:883
+#: ../plugins/itip-formatter/itip-formatter.c:884
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versiÃ³n existente desta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1166
+#: ../plugins/itip-formatter/itip-formatter.c:1167
 msgid "Unable to parse item"
 msgstr "Non Ã© posÃbel analizar o elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1256
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Non Ã© posÃbel enviar o elemento ao calendario Â«%sÂ». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1268
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario Â«%sÂ» como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario Â«%sÂ» como provisional"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1277
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario Â«%sÂ» como rexeitado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1282
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario Â«%sÂ» como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador eliminou o delegado %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1383
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviouse unha notificaciÃ³n de cancelaciÃ³n ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Non foi posÃbel enviar unha notificaciÃ³n de cancelaciÃ³n ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1495
+#: ../plugins/itip-formatter/itip-formatter.c:1496
 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1525
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non Ã© posÃbel actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1528
+#: ../plugins/itip-formatter/itip-formatter.c:1529
 msgid "Attendee status updated"
 msgstr "Actualizouse o estado de participante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1532
+#: ../plugins/itip-formatter/itip-formatter.c:1533
 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1554
+#: ../plugins/itip-formatter/itip-formatter.c:1555
 msgid "Meeting information sent"
 msgstr "Enviouse a informaciÃ³n da reuniÃ³n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1558
 msgid "Task information sent"
 msgstr "Enviouse a informaciÃ³n da tarefa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1560
+#: ../plugins/itip-formatter/itip-formatter.c:1561
 msgid "Memo information sent"
 msgstr "Enviouse a informaciÃ³n da nota"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1569
+#: ../plugins/itip-formatter/itip-formatter.c:1570
 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1573
 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 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.
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1641
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1645
+#: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Save Calendar"
 msgstr "Gardar o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1703
-#: ../plugins/itip-formatter/itip-formatter.c:1714
+#: ../plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1715
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexado non Ã© vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1704
-#: ../plugins/itip-formatter/itip-formatter.c:1715
+#: ../plugins/itip-formatter/itip-formatter.c:1705
+#: ../plugins/itip-formatter/itip-formatter.c:1716
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17781,15 +17805,15 @@ msgstr ""
 "A mensaxe di que contÃ©n un calendario pero o calendario non Ã© un iCalendar "
 "correcto."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1755
-#: ../plugins/itip-formatter/itip-formatter.c:1783
-#: ../plugins/itip-formatter/itip-formatter.c:1892
-msgid "The item in the calendar is not valid"
-msgstr "O elemento do calendario non Ã© vÃ¡lido"
-
 #: ../plugins/itip-formatter/itip-formatter.c:1756
 #: ../plugins/itip-formatter/itip-formatter.c:1784
 #: ../plugins/itip-formatter/itip-formatter.c:1893
+msgid "The item in the calendar is not valid"
+msgstr "O elemento do calendario non Ã© vÃ¡lido"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1757
+#: ../plugins/itip-formatter/itip-formatter.c:1785
+#: ../plugins/itip-formatter/itip-formatter.c:1894
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17797,11 +17821,11 @@ msgstr ""
 "A mensaxe contÃ©n un calendario pero o calendario non contÃ©n actividades, "
 "tarefas nin informaciÃ³n de dispoÃ±ibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../plugins/itip-formatter/itip-formatter.c:1798
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexado contÃ©n mÃºltiples elementos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1798
+#: ../plugins/itip-formatter/itip-formatter.c:1799
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17809,40 +17833,40 @@ msgstr ""
 "Para procesar todos estes elementos, deberÃa gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2461
 msgctxt "cal-itip"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2476
+#: ../plugins/itip-formatter/itip-formatter.c:2477
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2594
+#: ../plugins/itip-formatter/itip-formatter.c:2595
 msgid "This meeting recurs"
 msgstr "Esta reuniÃ³n repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2597
+#: ../plugins/itip-formatter/itip-formatter.c:2598
 msgid "This task recurs"
 msgstr "Esta tarefa repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2600
+#: ../plugins/itip-formatter/itip-formatter.c:2601
 msgid "This memo recurs"
 msgstr "Esta nota repÃtese"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2834
+#: ../plugins/itip-formatter/itip-formatter.c:2835
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois da acciÃ³n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2844
-#: ../plugins/itip-formatter/itip-formatter.c:2877
+#: ../plugins/itip-formatter/itip-formatter.c:2845
+#: ../plugins/itip-formatter/itip-formatter.c:2878
 msgid "Conflict Search"
 msgstr "Busca de conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2859
+#: ../plugins/itip-formatter/itip-formatter.c:2860
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccionar os calendarios nos que buscar conflitos entre reuniÃ³ns"
 
@@ -18444,13 +18468,6 @@ msgstr[1] ""
 "Recibiu %d mensaxes novas\n"
 "en %s."
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:410
-#, c-format
-msgid "From: %s"
-msgstr "De: %s:"
-
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
 #: ../plugins/mail-notification/mail-notification.c:423
@@ -18946,15 +18963,6 @@ msgstr "Mostra as partes HTML _suprimidas convertidas en anexos"
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-msgid "Evolution Profiler"
-msgstr "Perfilador do Evolution"
-
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Profile data events in Evolution (for developers only)."
-msgstr ""
-"Analizar as actividades de datos no Evolution (sÃ³ para desenvolvedores)."
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
 msgstr "Importar as mensaxes do Outlook desde un ficheiro PST"
@@ -19355,18 +19363,24 @@ msgstr ""
 "substitÃºa no corpo dunha mensaxe."
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Engadido de modelos baseado nos borradores"
+msgid ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
+"an email you are replying to."
+msgstr ""
+"Borradores baseados nun engadido de plantilla. Pode usar variÃ¡beis como $ORIG"
+"[subject], $ORIG[from], $ORIG[to] ou $ORIG[body], que se substituirÃ¡n cos "
+"valores do correo electrÃ³nico ao que estÃ¡ respondendo."
 
-#: ../plugins/templates/templates.c:635
+#: ../plugins/templates/templates.c:941
 msgid "No Title"
 msgstr "Sen tÃtulo"
 
-#: ../plugins/templates/templates.c:746
+#: ../plugins/templates/templates.c:1042
 msgid "Save as _Template"
 msgstr "Gardar como un _modelo"
 
-#: ../plugins/templates/templates.c:748
+#: ../plugins/templates/templates.c:1044
 msgid "Save as Template"
 msgstr "Gardar como un modelo"
 
@@ -19593,7 +19607,7 @@ msgstr "A barra lateral estÃ¡ visÃbel"
 msgid "Skip development warning dialog"
 msgstr "Saltar o diÃ¡logo de aviso de desenvolvemento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:373
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexiÃ³n"
 
@@ -19781,15 +19795,15 @@ msgstr "Bus_car: "
 msgid "i_n"
 msgstr "e_n"
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:219
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:257
+#: ../shell/e-shell-utils.c:221
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:278
+#: ../shell/e-shell-utils.c:242
 msgid "All Files (*)"
 msgstr "Todos os ficheiros (*)"
 
@@ -20080,7 +20094,7 @@ msgid "Execute these search parameters"
 msgstr "Executar estes parÃ¡metros de busca"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:584
+#: ../shell/e-shell-window-private.c:580
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20089,20 +20103,20 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/e-shell.c:257
+#: ../shell/e-shell.c:314
 msgid "Preparing to go offline..."
 msgstr "Preparando a desconexiÃ³nâ?¦"
 
-#: ../shell/e-shell.c:310
+#: ../shell/e-shell.c:367
 msgid "Preparing to go online..."
 msgstr "Preparando a conexiÃ³nâ?¦"
 
-#: ../shell/e-shell.c:372
+#: ../shell/e-shell.c:429
 msgid "Preparing to quit..."
 msgstr "Preparando a saÃdaâ?¦"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:189
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20139,7 +20153,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
 "agardamos con ansias as sÃºas colaboraciÃ³ns!\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:213
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20147,13 +20161,13 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:220
 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:365
+#: ../shell/main.c:367
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20161,52 +20175,52 @@ msgstr ""
 "Iniciar o Evolution mostrando o compoÃ±ente indicado. As opciÃ³n dispoÃ±Ãbeis "
 "son 'mail', 'calendar', 'contacts', 'tasks' e 'memos'"
 
-#: ../shell/main.c:369
+#: ../shell/main.c:371
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometrÃa indicada Ã¡ xanela principal"
 
-#: ../shell/main.c:373
+#: ../shell/main.c:375
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:375
+#: ../shell/main.c:377
 msgid "Ignore network availability"
 msgstr "Ignorar a dispoÃ±ibilidade da rede"
 
-#: ../shell/main.c:377
+#: ../shell/main.c:379
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo Â«expressÂ»"
 
-#: ../shell/main.c:380
+#: ../shell/main.c:382
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche do Evolution"
 
-#: ../shell/main.c:383
+#: ../shell/main.c:385
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saÃda da depuraciÃ³n de todos os compoÃ±entes a un ficheiro."
 
-#: ../shell/main.c:385
+#: ../shell/main.c:387
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de todos os engadidos."
 
-#: ../shell/main.c:387
+#: ../shell/main.c:389
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de previsualizaciÃ³n de correo, contactos e tarefas."
 
-#: ../shell/main.c:391
+#: ../shell/main.c:393
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 "Importar os URIs ou nomes de ficheiros fornecidos como resto dos argumentos."
 
-#: ../shell/main.c:393
+#: ../shell/main.c:395
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar a saÃda dun proceso de execuciÃ³n do Evolution"
 
-#: ../shell/main.c:557 ../shell/main.c:565
+#: ../shell/main.c:569 ../shell/main.c:577
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de correo e XIP Evolution"
 
-#: ../shell/main.c:627
+#: ../shell/main.c:640
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20215,7 +20229,7 @@ msgstr ""
 "%s: --online e --offline non poden usarse Ã¡ vez.\n"
 "  Use Â«%s --helpÂ» para mÃ¡is informaciÃ³n.\n"
 
-#: ../shell/main.c:633
+#: ../shell/main.c:646
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21039,11 +21053,11 @@ msgstr "Tipo MIME:"
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suxerir automaticamente a visualizaciÃ³n do anexo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:96
+#: ../widgets/misc/e-attachment-handler-image.c:91
 msgid "Could not set as background"
 msgstr "Non foi posÃbel establecela como fondo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:148
+#: ../widgets/misc/e-attachment-handler-image.c:141
 msgid "Set as _Background"
 msgstr "Estabelecer como _fondo"
 
@@ -21576,7 +21590,7 @@ msgstr "NingÃºn"
 
 #: ../widgets/misc/e-signature-editor.c:134
 #: ../widgets/misc/e-signature-editor.c:560
-#: ../widgets/misc/e-signature-manager.c:348
+#: ../widgets/misc/e-signature-manager.c:368
 #: ../widgets/misc/e-signature-script-dialog.c:215
 msgid "Unnamed"
 msgstr "Sen nome"
@@ -21593,15 +21607,15 @@ msgstr "Editar a sinatura"
 msgid "_Signature Name:"
 msgstr "Nome da _sinatura:"
 
-#: ../widgets/misc/e-signature-manager.c:293
+#: ../widgets/misc/e-signature-manager.c:313
 msgid "Add Signature Script"
 msgstr "Engadir un script de sinatura"
 
-#: ../widgets/misc/e-signature-manager.c:358
+#: ../widgets/misc/e-signature-manager.c:378
 msgid "Edit Signature Script"
 msgstr "Editar o script de sinatura"
 
-#: ../widgets/misc/e-signature-manager.c:577
+#: ../widgets/misc/e-signature-manager.c:598
 msgid "Add _Script"
 msgstr "Engadir un _script"
 
@@ -21627,41 +21641,41 @@ msgstr "O ficheiro do script debe ser executÃ¡bel."
 msgid "Click here to go to URL"
 msgstr "Prema aquÃ para ir ao URL"
 
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:382
 msgid "_Copy Link Location"
 msgstr "_Copiar a localizaciÃ³n da ligazÃ³n"
 
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:384
 msgid "Copy the link to the clipboard"
 msgstr "Copiar a ligazÃ³n no portapapeis"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:392
 msgid "_Open Link in Browser"
 msgstr "_Abrir a ligazÃ³n no navegador"
 
-#: ../widgets/misc/e-web-view.c:387
+#: ../widgets/misc/e-web-view.c:394
 msgid "Open the link in a web browser"
 msgstr "_Abrir a ligazÃ³n no navegador web"
 
-#: ../widgets/misc/e-web-view.c:395
+#: ../widgets/misc/e-web-view.c:402
 msgid "_Copy Email Address"
 msgstr "Copiar o enderezo de _correo"
 
-#: ../widgets/misc/e-web-view.c:424 ../widgets/misc/e-web-view.c:1080
+#: ../widgets/misc/e-web-view.c:431 ../widgets/misc/e-web-view.c:1221
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto e as imaxes"
 
-#: ../widgets/misc/e-web-view.c:860 ../widgets/misc/e-web-view.c:862
-#: ../widgets/misc/e-web-view.c:864
+#: ../widgets/misc/e-web-view.c:892 ../widgets/misc/e-web-view.c:894
+#: ../widgets/misc/e-web-view.c:896
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar a %s"
 
-#: ../widgets/misc/e-web-view.c:866
+#: ../widgets/misc/e-web-view.c:898
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar/mostrar os enderezos"
 
-#: ../widgets/misc/e-web-view.c:868
+#: ../widgets/misc/e-web-view.c:900
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -21953,6 +21967,40 @@ msgstr "Seleccionar todo"
 msgid "Input Methods"
 msgstr "MÃ©todos de entrada"
 
+#~ msgid "The organizer selected no longer has an account."
+#~ msgstr "O organizador seleccionado xa non ten unha conta."
+
+#~ msgid "Run Anjal in a window"
+#~ msgstr "Executar Anjar nunha xanela"
+
+#~ msgid "Make Anjal the default email client"
+#~ msgstr "Facer do Anjal o cliente de correo electrÃ³nico predeterminado"
+
+#~ msgid "Anjal email client"
+#~ msgstr "Cliente de correo Anjal"
+
+#~ msgid "Opening store '%s'"
+#~ msgstr "Abrindo o almacenamento Â«%sÂ»"
+
+#~ msgid "Delete messages in Search Folder \"{0}\"?"
+#~ msgstr "Desexa eliminar as mensaxes do cartafol de busca Â«{0}Â»?"
+
+#~ msgid "Header Value Contains:"
+#~ msgstr "O valor da cabeceira contÃ©n:"
+
+#~ msgid "_Add attachment..."
+#~ msgstr "Anex_arâ?¦"
+
+#~ msgid "Evolution Profiler"
+#~ msgstr "Perfilador do Evolution"
+
+#~ msgid "Profile data events in Evolution (for developers only)."
+#~ msgstr ""
+#~ "Analizar as actividades de datos no Evolution (sÃ³ para desenvolvedores)."
+
+#~ msgid "Drafts based template plugin"
+#~ msgstr "Engadido de modelos baseado nos borradores"
+
 #~ msgid "(map)"
 #~ msgstr "(mapa)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]