[evolution] Updated Spanish translation

From: Jorge Gonzalez Gonzalez <jorgegonz src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Updated Spanish translation
Date: Tue, 22 Jun 2010 19:23:22 +0000 (UTC)
commit d1f097938d88167dfcf97f48900c2f3a6c3412bd
Author: Jorge GonzÃ¡lez <jorgegonz svn gnome org>
Date:   Tue Jun 22 21:23:15 2010 +0200

    Updated Spanish translation

 po/es.po | 2087 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1073 insertions(+), 1014 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 181f8fc..58bafb1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,14 +11,14 @@
 # Francisco Javier F. Serrador <serrador cvs gnome org>, 2003, 2004, 2005, 2006.
 # Jorge GonzÃ¡lez <jorgegonz svn gnome org>, 2007, 2008, 2009, 2010.
 #
-#: ../shell/main.c:504
+#: ../shell/main.c:519
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution\n"
-"POT-Creation-Date: 2010-06-02 23:52+0000\n"
-"PO-Revision-Date: 2010-06-03 11:33+0200\n"
+"POT-Creation-Date: 2010-06-21 20:19+0000\n"
+"PO-Revision-Date: 2010-06-22 21:18+0200\n"
 "Last-Translator: Jorge GonzÃ¡lez <jorgegonz svn gnome org>\n"
 "Language-Team: EspaÃ±ol <gnome-es-list gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -228,7 +228,7 @@ msgstr ""
 "Los contactos para {0} no estarÃ¡n disponibles hasta que Evolution se "
 "reinicie."
 
-#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:521
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -251,20 +251,6 @@ msgstr "_Redimensionar"
 msgid "_Use as it is"
 msgstr "_Usar tal cual es"
 
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "DirecciÃ³n de sincr. predeterminada:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "No se pudo cargar la libreta de direcciones"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "No es posible leer el bloque de la aplicaciÃ³n de Direcciones del Pilot"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
 #: ../calendar/gui/e-calendar-view.c:2022
@@ -279,7 +265,7 @@ msgstr "Aniversario"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
 #: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:116
+#: ../shell/main.c:118
 msgid "Birthday"
 msgstr "CumpleaÃ±os"
 
@@ -427,7 +413,7 @@ msgid "_Blog:"
 msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:863
+#: ../calendar/gui/dialogs/event-page.c:882
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 #: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
@@ -688,7 +674,7 @@ msgid "_Suffix:"
 msgstr "_Sufijo:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:676
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:683
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
@@ -705,7 +691,7 @@ msgid "_List name:"
 msgstr "_Nombre de la lista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:168
 msgid "_Select..."
 msgstr "_Seleccionarâ?¦"
 
@@ -714,24 +700,24 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Teclee una direcciÃ³n de correo o arrastre un contacto a la lista inferior:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:769
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:776
 msgid "Contact List Members"
 msgstr "Miembros de la lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1333
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:924
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1340
 msgid "_Members"
 msgstr "_Miembros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
 msgid "Error adding list"
 msgstr "Error al aÃ±adir la lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
 msgid "Error modifying list"
 msgstr "Error al modificar la lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1200
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1207
 msgid "Error removing list"
 msgstr "Error al eliminar la lista"
 
@@ -1122,13 +1108,13 @@ msgid "Home Email"
 msgstr "Correo-e de casa"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:805
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "Otro correo-e"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "libreta de direcciones de Evolution"
 
@@ -1140,7 +1126,7 @@ msgstr "Contacto nuevo"
 msgid "New Contact List"
 msgstr "Lista de contactos nueva"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1263,13 +1249,13 @@ msgstr "Diario web"
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
 #: ../capplet/settings/mail-capplet-shell.c:350
 #: ../modules/addressbook/e-book-shell-backend.c:176
-#: ../modules/addressbook/e-book-shell-migrate.c:134
+#: ../modules/addressbook/e-book-shell-migrate.c:138
 #: ../modules/calendar/e-cal-shell-backend.c:180
 #: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:119
+#: ../modules/calendar/e-task-shell-migrate.c:121
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Privado"
@@ -1511,7 +1497,7 @@ msgstr "Copiar contactos a"
 msgid "Card View"
 msgstr "Vista de la tarjeta"
 
-#: ../addressbook/importers/evolution-csv-importer.c:713
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:264
 #: ../calendar/importers/icalendar-importer.c:325
@@ -1519,27 +1505,27 @@ msgstr "Vista de la tarjeta"
 msgid "Importing..."
 msgstr "Importandoâ?¦"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1001
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "VSC o Tab de Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1002
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importador de VSC y Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1010
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "VSC o Tab de Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1011
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importador de VSC y Tab de Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1019
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "VSC o Tab de Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1020
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador de VSC y Tab de Evolution"
 
@@ -1655,7 +1641,7 @@ msgid "Enter password for %s (user %s)"
 msgstr "Introduzca la contraseÃ±a para %s (usuario %s)"
 
 #: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
+#: ../calendar/common/authentication.c:55
 #: ../plugins/caldav/caldav-browse-server.c:813
 #: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
@@ -2054,7 +2040,7 @@ msgstr "Sus tareas no estarÃ¡n disponibles hasta que reinicie Evolution."
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:309
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -2072,49 +2058,6 @@ msgstr "_Enviar"
 msgid "_Send Notice"
 msgstr "_Enviar notificaciÃ³n"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "Dividir acontecimientos de dÃas mÃºltiples:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "No se ha podido iniciar el servidor evolution-data-server"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr ""
-"No es posible leer informaciÃ³n de la aplicaciÃ³n de calendario del Pilot"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "No es posible leer los datos de la aplicaciÃ³n Memo del Pilot"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "No es posible escribir los datos de la aplicaciÃ³n Memo del Pilot"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "Prioridad predeterminada:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "No es posible leer los datos de la aplicaciÃ³n ToDo del Pilot"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "No es posible escribir el bloque de aplicaciÃ³n ToDo del Pilot"
-
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
@@ -2160,9 +2103,9 @@ msgstr "_Descartar"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
 #: ../calendar/gui/dialogs/comp-editor.c:1021
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:151
+#: ../mail/e-mail-browser.c:152
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1646
+#: ../shell/e-shell-window-actions.c:1607
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
@@ -2431,7 +2374,7 @@ msgid "Last alarm time"
 msgstr "Hora de la Ãºltima alerta"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel mÃ¡s allÃ¡ del cuÃ¡l el mensaje se debe registrar."
 
@@ -3101,7 +3044,7 @@ msgstr "Sonido de alerta personalizado"
 msgid "Mes_sage:"
 msgstr "_Mensaje:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:78
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:79
 msgid "Options"
 msgstr "Opciones"
 
@@ -3254,7 +3197,7 @@ msgid "Alerts"
 msgstr "Alertas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Formato de la fecha y hora"
@@ -3289,7 +3232,7 @@ msgstr "viernes"
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:55
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
 #: ../modules/addressbook/addressbook-config.c:1005
 #: ../plugins/itip-formatter/itip-formatter.c:2675
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
@@ -3320,7 +3263,7 @@ msgid "None"
 msgstr "Ninguna"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Pick a color"
 msgstr "Elija un color"
 
@@ -3517,7 +3460,7 @@ msgstr "Tipo:"
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:156
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:160
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
@@ -3674,22 +3617,22 @@ msgstr "Â¿Mantener el elemento original?"
 msgid "Click here to close the current window"
 msgstr "Pulse aquÃ para cerrar la ventana actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951 ../mail/e-mail-browser.c:116
-#: ../shell/e-shell-window-actions.c:1485
+#: ../calendar/gui/dialogs/comp-editor.c:951 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Copiar la selecciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:958 ../mail/e-mail-browser.c:123
-#: ../shell/e-shell-window-actions.c:1492
+#: ../calendar/gui/dialogs/comp-editor.c:958 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
 #: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Cortar la selecciÃ³n"
 
 #: ../calendar/gui/dialogs/comp-editor.c:965
-#: ../shell/e-shell-window-actions.c:1499
+#: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Eliminar la selecciÃ³n"
@@ -3698,8 +3641,8 @@ msgstr "Eliminar la selecciÃ³n"
 msgid "Click here to view help available"
 msgstr "Pulse aquÃ para ver la ayuda disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:979 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:1534
+#: ../calendar/gui/dialogs/comp-editor.c:979 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1502
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
@@ -3709,8 +3652,8 @@ msgstr "Pega el contenido del porta papeles"
 msgid "Click here to save the current window"
 msgstr "Pulse aquÃ para guardar la vista actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1604
+#: ../calendar/gui/dialogs/comp-editor.c:1007 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1572
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
@@ -3719,14 +3662,14 @@ msgstr "Selecciona todo el texto"
 msgid "_Classification"
 msgstr "_ClasificaciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1028 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1653
+#: ../calendar/gui/dialogs/comp-editor.c:1028 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Archivo"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1035
-#: ../shell/e-shell-window-actions.c:1660
+#: ../shell/e-shell-window-actions.c:1621
 msgid "_Help"
 msgstr "Ay_uda"
 
@@ -3735,17 +3678,17 @@ msgid "_Insert"
 msgstr "_Insertar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1049
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:312
 msgid "_Options"
 msgstr "_Opciones"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1056 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1695 ../smime/gui/smime-ui.ui.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1056 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1656 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_Ver"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1066
-#: ../composer/e-composer-actions.c:281
+#: ../composer/e-composer-actions.c:240
 msgid "_Attachment..."
 msgstr "_Adjuntoâ?¦"
 
@@ -3831,7 +3774,7 @@ msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1704
-#: ../composer/e-composer-actions.c:469
+#: ../composer/e-composer-actions.c:428
 msgid "Attach"
 msgstr "Adjuntar"
 
@@ -3994,87 +3937,87 @@ msgstr "Cita"
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:571
+#: ../calendar/gui/dialogs/event-editor.c:573
 msgid "Print this event"
 msgstr "Imprime este acontecimiento"
 
-#: ../calendar/gui/dialogs/event-page.c:747
+#: ../calendar/gui/dialogs/event-page.c:766
 msgid "Event's start time is in the past"
 msgstr "La hora de inicio del acontecimiento estÃ¡ en el pasado"
 
-#: ../calendar/gui/dialogs/event-page.c:788
+#: ../calendar/gui/dialogs/event-page.c:807
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "El acontecimiento no se puede editar porque es de sÃ³lo lectura"
 
-#: ../calendar/gui/dialogs/event-page.c:792
+#: ../calendar/gui/dialogs/event-page.c:811
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "El acontecimiento no se puede editar completamente porque no es el "
 "organizador"
 
-#: ../calendar/gui/dialogs/event-page.c:804
-#: ../calendar/gui/dialogs/event-page.c:2756
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
 msgid "This event has alarms"
 msgstr "Este acontecimiento tiene alertas."
 
-#: ../calendar/gui/dialogs/event-page.c:871
+#: ../calendar/gui/dialogs/event-page.c:890
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:918
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:939
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1135
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "Acontecimiento sin fecha de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1138
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha de finalizaciÃ³n"
 
-#: ../calendar/gui/dialogs/event-page.c:1309
+#: ../calendar/gui/dialogs/event-page.c:1328
 #: ../calendar/gui/dialogs/memo-page.c:686
 #: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "La fecha de inicio estÃ¡ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1319
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "La fecha de finalizaciÃ³n estÃ¡ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1342
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "La hora de inicio estÃ¡ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1349
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "La hora de finalizaciÃ³n estÃ¡ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1511
+#: ../calendar/gui/dialogs/event-page.c:1530
 #: ../calendar/gui/dialogs/memo-page.c:727
 #: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta."
 
-#: ../calendar/gui/dialogs/event-page.c:1517
+#: ../calendar/gui/dialogs/event-page.c:1536
 #: ../calendar/gui/dialogs/memo-page.c:733
 #: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1542
+#: ../calendar/gui/dialogs/event-page.c:1561
 #: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:2630
+#: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No es posible abrir el calendario Â«%sÂ»."
@@ -4085,40 +4028,40 @@ msgstr "No es posible abrir el 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:2674
+#: ../calendar/gui/dialogs/event-page.c:2693
 #: ../calendar/gui/dialogs/memo-page.c:946
 #: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "EstÃ¡ actuando en nombre de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2975
+#: ../calendar/gui/dialogs/event-page.c:2994
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dÃa antes de la cita"
 msgstr[1] "%d dÃas antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2981
+#: ../calendar/gui/dialogs/event-page.c:3000
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes de la cita"
 msgstr[1] "%d horas antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2987
+#: ../calendar/gui/dialogs/event-page.c:3006
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes de la cita"
 msgstr[1] "%d minutos antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3000
+#: ../calendar/gui/dialogs/event-page.c:3019
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3002
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ninguna"
@@ -4417,7 +4360,7 @@ msgstr "Cada"
 msgid "Exceptions"
 msgstr "Excepciones"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:86
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:87
 msgid "Preview"
 msgstr "Vista previa"
 
@@ -4449,12 +4392,12 @@ msgstr "Enviar mis alarmas con este evento"
 msgid "Notify new attendees _only"
 msgstr "Notificar sÃ³l_o a los participantes"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "La fecha de terminaciÃ³n es errÃ³nea"
 
-#: ../calendar/gui/dialogs/task-details-page.c:486
+#: ../calendar/gui/dialogs/task-details-page.c:483
 msgid "Web Page"
 msgstr "PÃ¡gina web"
 
@@ -4475,7 +4418,7 @@ msgstr "Terminado"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
 #: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1125 ../widgets/misc/e-send-options.ui.h:8
+#: ../mail/message-list.c:1172 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Alta"
 
@@ -4494,7 +4437,7 @@ msgstr "En proceso"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:9
+#: ../mail/message-list.c:1170 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Baja"
 
@@ -4502,7 +4445,7 @@ msgstr "Baja"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
 #: ../calendar/gui/e-cal-model.c:1254 ../calendar/gui/e-task-table.c:511
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1124
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1171
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Normal"
@@ -4736,7 +4679,7 @@ msgstr "Prioridad:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
 #: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "DescripciÃ³n:"
 
@@ -5010,7 +4953,7 @@ msgstr "%A %e de %B"
 #. specifiers or add anything.
 #: ../calendar/gui/e-day-view-top-item.c:882 ../calendar/gui/e-day-view.c:1895
 #: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
 msgstr "%a, %e de %b"
@@ -5022,7 +4965,7 @@ msgstr "%a, %e de %b"
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-day-view-top-item.c:886 ../calendar/gui/e-day-view.c:1911
 #: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:232
 #: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
 msgstr "%e de %b"
@@ -5040,7 +4983,7 @@ msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2637
+#: ../calendar/gui/e-day-view.c:2645
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -5793,23 +5736,23 @@ msgstr "vista de acontecimientos del calendario"
 msgid "Grab Focus"
 msgstr "Obtener el foco"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "Cita nueva"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "Acontecimiento nuevo para todo el dÃa"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "ReuniÃ³n nueva"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "Ir a hoy"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "Ir a una fecha"
 
@@ -5818,7 +5761,7 @@ msgstr "Ir a una fecha"
 msgid "a table to view and select the current time range"
 msgstr "una tabla para ver y seleccionar el rango de tiempo actual"
 
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5827,14 +5770,14 @@ msgstr[1] "Tiene %d acontecimientos."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
 msgid "It has no events."
 msgstr "No tiene acontecimientos."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:162
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vista de la semana laboral: %s. %s"
@@ -5842,43 +5785,43 @@ msgstr "Vista de la semana laboral: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:168
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vista diaria: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for a work week"
 msgstr "vista de calendario para una semana laboral"
 
-#: ../calendar/gui/ea-day-view.c:199
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for one or more days"
 msgstr "vista de calendario para uno o mÃ¡s dÃas"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Calendario de GNOME"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../calendar/gui/ea-gnome-calendar.c:199
 #: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
 msgstr "%A, %e de %b de %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../modules/calendar/e-cal-shell-view-private.c:1017
 #: ../modules/calendar/e-cal-shell-view-private.c:1023
 #: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%a, %e de %b de %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../calendar/gui/ea-gnome-calendar.c:242
 #: ../modules/calendar/e-cal-shell-view-private.c:1043
 #: ../modules/calendar/e-cal-shell-view-private.c:1054
 #: ../modules/calendar/e-cal-shell-view-private.c:1061
@@ -5894,25 +5837,25 @@ msgstr "BotÃ³n de salto"
 msgid "Click here, you can find more events."
 msgstr "Pulse aquÃ para buscar mÃ¡s acontecimientos."
 
-#: ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vista mensual: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vista semanal: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:188
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for a month"
 msgstr "vista de calendario para un mes"
 
-#: ../calendar/gui/ea-week-view.c:190
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para una o mÃ¡s semanas"
 
-#: ../calendar/gui/gnome-cal.c:2239
+#: ../calendar/gui/gnome-cal.c:2280
 msgid "Purging"
 msgstr "Compactando"
 
@@ -6362,7 +6305,6 @@ msgid "Reminder!"
 msgstr "Â¡Recuerde!"
 
 #: ../calendar/importers/icalendar-importer.c:662
-#| msgid "vCalendar files (.vcf)"
 msgid "vCalendar files (.vcs)"
 msgstr "Archivos vCalendar (.vcs)"
 
@@ -8072,161 +8014,157 @@ msgstr "PacÃfico/Wallis"
 msgid "Pacific/Yap"
 msgstr "PacÃfico/Yap"
 
-#: ../composer/e-composer-actions.c:81
-msgid "Untitled Message"
-msgstr "Mensaje sin tÃtulo"
-
-#: ../composer/e-composer-actions.c:204
+#: ../composer/e-composer-actions.c:163
 msgid "Save as..."
 msgstr "Guardar comoâ?¦"
 
-#: ../composer/e-composer-actions.c:283
-#: ../widgets/misc/e-attachment-view.c:327
+#: ../composer/e-composer-actions.c:242
+#: ../widgets/misc/e-attachment-view.c:329
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:247
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../composer/e-composer-actions.c:290
+#: ../composer/e-composer-actions.c:249
 msgid "Close the current file"
 msgstr "Cierra el archivo actual"
 
-#: ../composer/e-composer-actions.c:295
+#: ../composer/e-composer-actions.c:254
 msgid "_Print..."
 msgstr "_Imprimirâ?¦"
 
-#: ../composer/e-composer-actions.c:302
+#: ../composer/e-composer-actions.c:261
 msgid "Print Pre_view"
 msgstr "Vist_a previa de impresiÃ³n"
 
-#: ../composer/e-composer-actions.c:311
+#: ../composer/e-composer-actions.c:270
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:275
 msgid "Save _As..."
 msgstr "Guardar _comoâ?¦"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:277
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:282
 msgid "Save as _Draft"
 msgstr "Guardar como _borrador"
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:284
 msgid "Save as draft"
 msgstr "Guardar como borrador"
 
-#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:290
+#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:291
 msgid "Send this message"
 msgstr "Enviar este mensaje"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:296
 msgid "New _Message"
 msgstr "_Mensaje nuevo"
 
-#: ../composer/e-composer-actions.c:339
+#: ../composer/e-composer-actions.c:298
 msgid "Open New Message window"
 msgstr "Abrir la ventana del mensaje nuevo"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:305
 msgid "Character _Encoding"
 msgstr "_CodificaciÃ³n de caracteres"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:322
 msgid "PGP _Encrypt"
 msgstr "Cif_rar con PGP"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:324
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar este mensaje con PGP"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:330
 msgid "PGP _Sign"
 msgstr "_Firmar con PGP"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:332
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con su clave GPG"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:338
 msgid "_Prioritize Message"
 msgstr "_Priorizar mensaje"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:340
 msgid "Set the message priority to high"
 msgstr "Establecer la prioridad del mensaje a alta"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:346
 msgid "Re_quest Read Receipt"
 msgstr "_Solicitar confirmaciÃ³n de lectura"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:348
 msgid "Get delivery notification when your message is read"
 msgstr "Obtener notificaciÃ³n de entrega cuando su mensaje sea leÃdo"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:354
 msgid "S/MIME En_crypt"
 msgstr "C_ifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:356
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar este mensaje con su certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:362
 msgid "S/MIME Sig_n"
 msgstr "Fi_rmar con S/MIME"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:364
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Firmar este mensaje con su certificado de firma S/MIME"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:370
 msgid "_Bcc Field"
 msgstr "Campo Â«Cc_oÂ»"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:372
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Conmutador que indica si se muestra el campo Â«CcoÂ»"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:378
 msgid "_Cc Field"
 msgstr "Campo Â«_CcÂ»"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:380
 msgid "Toggles whether the CC field is displayed"
 msgstr "Conmutador que indica si se muestra el campo Â«CcÂ»"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:386
 msgid "_Reply-To Field"
 msgstr "Campo Â«_Responder-aÂ»"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:388
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Conmutador que indica si se muestra el campo Â«Responder-aÂ»"
 
-#: ../composer/e-composer-actions.c:472
+#: ../composer/e-composer-actions.c:431
 msgid "Save Draft"
 msgstr "Guardar borrador"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirÃ¡n una copia del mensaje"
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8234,35 +8172,35 @@ msgstr ""
 "Escriba las direcciones que recibirÃ¡n una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje"
 
-#: ../composer/e-composer-header-table.c:961
+#: ../composer/e-composer-header-table.c:1003
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:970
+#: ../composer/e-composer-header-table.c:1012
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:974
+#: ../composer/e-composer-header-table.c:1016
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:1021
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:984
+#: ../composer/e-composer-header-table.c:1026
 msgid "_Bcc:"
 msgstr "Cc_o:"
 
-#: ../composer/e-composer-header-table.c:989
+#: ../composer/e-composer-header-table.c:1031
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:993
+#: ../composer/e-composer-header-table.c:1035
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:1002
+#: ../composer/e-composer-header-table.c:1044
 msgid "Si_gnature:"
 msgstr "_Firma:"
 
@@ -8274,40 +8212,40 @@ msgstr "Pulse aquÃ para la libreta de direcciones"
 msgid "Click here to select folders to post to"
 msgstr "Pulse aquÃ para seleccionar carpetas en las que publicar"
 
-#: ../composer/e-composer-private.c:208
+#: ../composer/e-composer-private.c:211
 msgid "Undo the last action"
 msgstr "Deshacer la Ãºltima acciÃ³n"
 
-#: ../composer/e-composer-private.c:212
+#: ../composer/e-composer-private.c:215
 msgid "Redo the last undone action"
 msgstr "Rehacer la Ãºltima acciÃ³n deshecha"
 
-#: ../composer/e-composer-private.c:216
+#: ../composer/e-composer-private.c:219
 msgid "Search for text"
 msgstr "Buscar texto"
 
-#: ../composer/e-composer-private.c:220
+#: ../composer/e-composer-private.c:223
 msgid "Search for and replace text"
 msgstr "Buscar y reemplazar texto"
 
-#: ../composer/e-composer-private.c:310
+#: ../composer/e-composer-private.c:313
 msgid "Save draft"
 msgstr "Guardar borrador"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:186
+#: ../composer/e-msg-composer.c:199
 #: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "_No mostrar otra vez este mensaje."
 
-#: ../composer/e-msg-composer.c:1003
+#: ../composer/e-msg-composer.c:1030
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No es posible firmar el mensaje saliente: No hay establecido un certificado "
 "de firma para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1010
+#: ../composer/e-msg-composer.c:1041
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8315,20 +8253,24 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1403
+#: ../composer/e-msg-composer.c:1462
 msgid "Unable to reconstruct message from autosave file"
 msgstr "No se pudo reconstruir el mensaje desde el archivo autoguardado"
 
-#: ../composer/e-msg-composer.c:1469 ../composer/e-msg-composer.c:1676
+#: ../composer/e-msg-composer.c:1528 ../composer/e-msg-composer.c:1782
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:3331
+#: ../composer/e-msg-composer.c:3497
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "El editor contiene un mensaje cuyo cuerpo no tiene texto, el cual no puede "
 "editarse."
 
+#: ../composer/e-msg-composer.c:4102
+msgid "Untitled Message"
+msgstr "Mensaje sin tÃtulo"
+
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
@@ -8590,8 +8532,8 @@ msgstr ""
 "obtener su correo."
 
 #: ../capplet/settings/mail-account-view.c:608
-#: ../mail/em-account-editor.c:2086 ../mail/em-account-editor.c:2217
-#: ../mail/mail-config.ui.h:60
+#: ../mail/em-account-editor.c:2096 ../mail/em-account-editor.c:2227
+#: ../mail/mail-config.ui.h:61
 msgid "Identity"
 msgstr "Identidad"
 
@@ -8643,7 +8585,7 @@ msgid "Back - Receiving options"
 msgstr "AtrÃ¡s - Opciones de recepciÃ³n"
 
 #: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2791 ../mail/mail-config.ui.h:33
+#: ../mail/em-account-editor.c:2982 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "Predeterminados"
 
@@ -8728,16 +8670,16 @@ msgstr "Asistente de cuentas de Evolution"
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
 #: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:211
-#: ../mail/message-list.c:1607
+#: ../mail/message-list.c:1654
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:126
+#: ../modules/addressbook/e-book-shell-migrate.c:130
 #: ../modules/calendar/e-cal-shell-backend.c:121
 #: ../modules/calendar/e-cal-shell-backend.c:133
 #: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-migrate.c:111
 msgid "On This Computer"
 msgstr "En este equipo"
 
@@ -8766,7 +8708,7 @@ msgstr "Notificaciones de acontecimientos del calendario"
 msgid "Evolution Alarm Notify"
 msgstr "Notificador de alertas de Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:824
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:843
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8815,15 +8757,15 @@ msgstr "%sâ?¦"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
 msgid "Evolution Warning"
 msgstr "Advertencia de Evolution"
 
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:649
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Error interno, solicitado un error desconocido Â«%sÂ»"
@@ -8986,15 +8928,15 @@ msgstr "Mensajes de sucesos:"
 msgid "Log Level"
 msgstr "Nivel de sucesos"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2686
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2736
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
-#: ../shell/e-shell-window-actions.c:1457
-#: ../shell/e-shell-window-actions.c:1464
-#: ../shell/e-shell-window-actions.c:1471
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Close this window"
 msgstr "Cierra esta ventana"
 
@@ -9068,11 +9010,11 @@ msgstr "El archivo existe Â«{0}Â»."
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
-#: ../e-util/e-util.c:170
+#: ../e-util/e-util.c:166
 msgid "Could not open the link."
 msgstr "No se pudo abrir el enlace."
 
-#: ../e-util/e-util.c:220
+#: ../e-util/e-util.c:213
 msgid "Could not display help for Evolution."
 msgstr "No se pudo mostrar la ayuda de Evolution."
 
@@ -9117,7 +9059,7 @@ msgstr "Asunto"
 
 #. pseudo-header
 #: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2459
-#: ../modules/mail/em-mailer-prefs.c:1139
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "Transporte"
 
@@ -9444,7 +9386,7 @@ msgstr ""
 "La fecha del mensaje se compararÃ¡ con la\n"
 "fecha actual del momento del filtrado."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
 msgid "_Filter Rules"
 msgstr "Reglas de _filtrado"
 
@@ -9465,7 +9407,7 @@ msgstr "en el futuro"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:180
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:185
 msgid "seconds"
 msgstr "segundos"
 
@@ -9482,7 +9424,7 @@ msgid "years"
 msgstr "aÃ±os"
 
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1028 ../mail/mail-config.ui.h:14
+#: ../mail/em-format-html-display.c:1028 ../mail/mail-config.ui.h:15
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
 #: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
@@ -9500,7 +9442,7 @@ msgstr "Vista de icono"
 msgid "List View"
 msgstr "Vista de lista"
 
-#: ../mail/e-mail-browser.c:264
+#: ../mail/e-mail-browser.c:265
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -9579,8 +9521,8 @@ msgid "Name"
 msgstr "Nombre"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:706 ../mail/em-folder-tree.c:2706
-#: ../modules/mail/e-mail-shell-view-private.c:956
+#: ../mail/em-folder-tree-model.c:706 ../mail/em-folder-tree.c:2729
+#: ../modules/mail/e-mail-shell-view-private.c:953
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
@@ -9644,23 +9586,23 @@ msgstr "No se pueden crear las carpetas de correo local en: Â«%sÂ»: %s"
 msgid "Do not ask me again"
 msgstr "No preguntarme de nuevo"
 
-#: ../mail/e-mail-reader.c:260 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:262 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: ../mail/e-mail-reader.c:260 ../mail/em-folder-utils.c:378
+#: ../mail/e-mail-reader.c:262 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:634 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:636 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: ../mail/e-mail-reader.c:634 ../mail/em-folder-utils.c:378
+#: ../mail/e-mail-reader.c:636 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:860
+#: ../mail/e-mail-reader.c:862
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Guardar mensaje"
@@ -9672,505 +9614,505 @@ msgstr[1] "Guardar mensajes"
 #. * 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:881 ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/e-mail-reader.c:883 ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaje"
 msgstr[1] "Mensajes"
 
-#: ../mail/e-mail-reader.c:1139
+#: ../mail/e-mail-reader.c:1141
 msgid "A_dd Sender to Address Book"
 msgstr "_AÃ±adir remitente a la libreta"
 
-#: ../mail/e-mail-reader.c:1141
+#: ../mail/e-mail-reader.c:1143
 msgid "Add sender to address book"
 msgstr "AÃ±adir el remitente a la libreta de direcciones"
 
-#: ../mail/e-mail-reader.c:1146
+#: ../mail/e-mail-reader.c:1148
 msgid "Check for _Junk"
 msgstr "Detectar _SPAM"
 
-#: ../mail/e-mail-reader.c:1148
+#: ../mail/e-mail-reader.c:1150
 msgid "Filter the selected messages for junk status"
 msgstr "Filtra los mensajes seleccionados por el estado de SPAM"
 
-#: ../mail/e-mail-reader.c:1153
+#: ../mail/e-mail-reader.c:1155
 msgid "_Copy to Folder..."
 msgstr "Copiar a la c_arpetaâ?¦"
 
-#: ../mail/e-mail-reader.c:1155
+#: ../mail/e-mail-reader.c:1157
 msgid "Copy selected messages to another folder"
 msgstr "Copia mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:1160
+#: ../mail/e-mail-reader.c:1162
 msgid "_Delete Message"
 msgstr "_Eliminar el mensaje"
 
-#: ../mail/e-mail-reader.c:1162
+#: ../mail/e-mail-reader.c:1164
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para eliminar"
 
-#: ../mail/e-mail-reader.c:1167
+#: ../mail/e-mail-reader.c:1169
 msgid "Filter on Mailing _List..."
 msgstr "Filtro segÃºn la _lista de correoâ?¦"
 
-#: ../mail/e-mail-reader.c:1169
+#: ../mail/e-mail-reader.c:1171
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1174
+#: ../mail/e-mail-reader.c:1176
 msgid "Filter on _Recipients..."
 msgstr "Filtro segÃºn los _destinatariosâ?¦"
 
-#: ../mail/e-mail-reader.c:1176
+#: ../mail/e-mail-reader.c:1178
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
 
-#: ../mail/e-mail-reader.c:1181
+#: ../mail/e-mail-reader.c:1183
 msgid "Filter on Se_nder..."
 msgstr "Filtro segÃºn el _remitenteâ?¦"
 
-#: ../mail/e-mail-reader.c:1183
+#: ../mail/e-mail-reader.c:1185
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crea una regla para filtrar los mensajes de este remitente"
 
-#: ../mail/e-mail-reader.c:1188
+#: ../mail/e-mail-reader.c:1190
 msgid "Filter on _Subject..."
 msgstr "Filtro segÃºn el _asuntoâ?¦"
 
-#: ../mail/e-mail-reader.c:1190
+#: ../mail/e-mail-reader.c:1192
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crea una regla para filtrar los mensajes con este asunto"
 
 # ColisiÃ³n en la A
-#: ../mail/e-mail-reader.c:1195
+#: ../mail/e-mail-reader.c:1197
 msgid "A_pply Filters"
 msgstr "Aplicar _filtros"
 
-#: ../mail/e-mail-reader.c:1197
+#: ../mail/e-mail-reader.c:1199
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplica filtros a los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1202
+#: ../mail/e-mail-reader.c:1204
 msgid "_Find in Message..."
 msgstr "B_uscar en el mensajeâ?¦"
 
-#: ../mail/e-mail-reader.c:1204
+#: ../mail/e-mail-reader.c:1206
 msgid "Search for text in the body of the displayed message"
 msgstr "Busca un texto en el cuerpo del mensaje mostrado"
 
-#: ../mail/e-mail-reader.c:1209
+#: ../mail/e-mail-reader.c:1211
 msgid "_Clear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/e-mail-reader.c:1211
+#: ../mail/e-mail-reader.c:1213
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Quitar la marca de seguimiento de los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1216
+#: ../mail/e-mail-reader.c:1218
 msgid "_Flag Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../mail/e-mail-reader.c:1218
+#: ../mail/e-mail-reader.c:1220
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Establecer la marca de completado en los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1223
+#: ../mail/e-mail-reader.c:1225
 msgid "Follow _Up..."
 msgstr "Se_guimientoâ?¦"
 
-#: ../mail/e-mail-reader.c:1225
+#: ../mail/e-mail-reader.c:1227
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar los mensajes seleccionados para seguimiento"
 
-#: ../mail/e-mail-reader.c:1230
+#: ../mail/e-mail-reader.c:1232
 msgid "_Attached"
 msgstr "_Adjunto"
 
-#: ../mail/e-mail-reader.c:1232 ../mail/e-mail-reader.c:1239
+#: ../mail/e-mail-reader.c:1234 ../mail/e-mail-reader.c:1241
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ReenvÃa a alguien el mensaje seleccionado como un adjunto"
 
-#: ../mail/e-mail-reader.c:1237
+#: ../mail/e-mail-reader.c:1239
 msgid "Forward As _Attached"
 msgstr "Reenviar como _adjunto"
 
-#: ../mail/e-mail-reader.c:1244
+#: ../mail/e-mail-reader.c:1246
 msgid "_Inline"
 msgstr "_Incluido en lÃnea"
 
-#: ../mail/e-mail-reader.c:1246 ../mail/e-mail-reader.c:1253
+#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1255
 msgid "Forward the selected message in the body of a new message"
 msgstr "ReenvÃa el mensaje seleccionado en el cuerpo de un mensaje nuevo"
 
-#: ../mail/e-mail-reader.c:1251
+#: ../mail/e-mail-reader.c:1253
 msgid "Forward As _Inline"
 msgstr "Reenviar en _lÃnea"
 
-#: ../mail/e-mail-reader.c:1258
+#: ../mail/e-mail-reader.c:1260
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ../mail/e-mail-reader.c:1260 ../mail/e-mail-reader.c:1267
+#: ../mail/e-mail-reader.c:1262 ../mail/e-mail-reader.c:1269
 msgid "Forward the selected message quoted like a reply"
 msgstr "ReenvÃa el mensaje seleccionado citado como una respuesta"
 
-#: ../mail/e-mail-reader.c:1265
+#: ../mail/e-mail-reader.c:1267
 msgid "Forward As _Quoted"
 msgstr "Reenviar como ci_tado"
 
-#: ../mail/e-mail-reader.c:1272
+#: ../mail/e-mail-reader.c:1274
 msgid "_Load Images"
 msgstr "Cargar _imÃ¡genes"
 
-#: ../mail/e-mail-reader.c:1274
+#: ../mail/e-mail-reader.c:1276
 msgid "Force images in HTML mail to be loaded"
 msgstr "Fuerza la carga de imÃ¡genes en el correo HTML"
 
-#: ../mail/e-mail-reader.c:1279
+#: ../mail/e-mail-reader.c:1281
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:1281
+#: ../mail/e-mail-reader.c:1283
 msgid "Mark the selected messages as important"
 msgstr "Marcar los mensajes seleccionados como importantes"
 
-#: ../mail/e-mail-reader.c:1286
+#: ../mail/e-mail-reader.c:1288
 msgid "_Junk"
 msgstr "_SPAM"
 
-#: ../mail/e-mail-reader.c:1288
+#: ../mail/e-mail-reader.c:1290
 msgid "Mark the selected messages as junk"
 msgstr "Marcar los mensajes seleccionados como SPAM"
 
-#: ../mail/e-mail-reader.c:1293
+#: ../mail/e-mail-reader.c:1295
 msgid "_Not Junk"
 msgstr "No es SPA_M"
 
-#: ../mail/e-mail-reader.c:1295
+#: ../mail/e-mail-reader.c:1297
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar los mensajes seleccionados como no SPAM"
 
-#: ../mail/e-mail-reader.c:1300
+#: ../mail/e-mail-reader.c:1302
 msgid "_Read"
 msgstr "_LeÃdo"
 
-#: ../mail/e-mail-reader.c:1302
+#: ../mail/e-mail-reader.c:1304
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leÃdos"
 
-#: ../mail/e-mail-reader.c:1307
+#: ../mail/e-mail-reader.c:1309
 msgid "Uni_mportant"
 msgstr "N_o importante"
 
-#: ../mail/e-mail-reader.c:1309
+#: ../mail/e-mail-reader.c:1311
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar los mensajes seleccionados como no importantes"
 
-#: ../mail/e-mail-reader.c:1314
+#: ../mail/e-mail-reader.c:1316
 msgid "_Unread"
 msgstr "_No leÃdo"
 
-#: ../mail/e-mail-reader.c:1316
+#: ../mail/e-mail-reader.c:1318
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leÃdos"
 
-#: ../mail/e-mail-reader.c:1321
+#: ../mail/e-mail-reader.c:1323
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevoâ?¦"
 
-#: ../mail/e-mail-reader.c:1323
+#: ../mail/e-mail-reader.c:1325
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abre los mensajes seleccionados en el editor para editarlo"
 
-#: ../mail/e-mail-reader.c:1328
+#: ../mail/e-mail-reader.c:1330
 msgid "Compose _New Message"
 msgstr "Redactar un mensaje _nuevo"
 
-#: ../mail/e-mail-reader.c:1330
+#: ../mail/e-mail-reader.c:1332
 msgid "Open a window for composing a mail message"
 msgstr "Abre una ventana para escribir un mensaje de correo"
 
-#: ../mail/e-mail-reader.c:1335
+#: ../mail/e-mail-reader.c:1337
 msgid "_Open in New Window"
 msgstr "_Abrir en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:1337
+#: ../mail/e-mail-reader.c:1339
 msgid "Open the selected messages in a new window"
 msgstr "Abre los mensajes seleccionados en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:1342
+#: ../mail/e-mail-reader.c:1344
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpetaâ?¦"
 
-#: ../mail/e-mail-reader.c:1344
+#: ../mail/e-mail-reader.c:1346
 msgid "Move selected messages to another folder"
 msgstr "Mueve los mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:1349
+#: ../mail/e-mail-reader.c:1351
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ../mail/e-mail-reader.c:1351
+#: ../mail/e-mail-reader.c:1353
 msgid "Display the next message"
 msgstr "Mostrar el mensaje siguiente"
 
-#: ../mail/e-mail-reader.c:1356
+#: ../mail/e-mail-reader.c:1358
 msgid "Next _Important Message"
 msgstr "Mensaje siguiente _importante"
 
-#: ../mail/e-mail-reader.c:1358
+#: ../mail/e-mail-reader.c:1360
 msgid "Display the next important message"
 msgstr "Mostrar el mensaje siguiente importante"
 
-#: ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1365
 msgid "Next _Thread"
 msgstr "_ConversaciÃ³n siguiente"
 
-#: ../mail/e-mail-reader.c:1365
+#: ../mail/e-mail-reader.c:1367
 msgid "Display the next thread"
 msgstr "Mostrar la siguiente conversaciÃ³n"
 
-#: ../mail/e-mail-reader.c:1370
+#: ../mail/e-mail-reader.c:1372
 msgid "Next _Unread Message"
 msgstr "Mensaje siguiente _no leÃdo"
 
-#: ../mail/e-mail-reader.c:1372
+#: ../mail/e-mail-reader.c:1374
 msgid "Display the next unread message"
 msgstr "Mostrar el siguiente mensaje no leÃdo"
 
-#: ../mail/e-mail-reader.c:1377
+#: ../mail/e-mail-reader.c:1379
 msgid "_Previous Message"
 msgstr "Mensaje _anterior"
 
-#: ../mail/e-mail-reader.c:1379
+#: ../mail/e-mail-reader.c:1381
 msgid "Display the previous message"
 msgstr "Mostrar el mensaje anterior"
 
-#: ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1386
 msgid "Pr_evious Important Message"
 msgstr "Mensaje anterior i_mportante"
 
-#: ../mail/e-mail-reader.c:1386
+#: ../mail/e-mail-reader.c:1388
 msgid "Display the previous important message"
 msgstr "Mostrar el anterior mensaje importante"
 
-#: ../mail/e-mail-reader.c:1391
+#: ../mail/e-mail-reader.c:1393
 msgid "P_revious Unread Message"
 msgstr "Mensaje anterior n_o leÃdo"
 
-#: ../mail/e-mail-reader.c:1393
+#: ../mail/e-mail-reader.c:1395
 msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no leÃdo"
 
-#: ../mail/e-mail-reader.c:1400
+#: ../mail/e-mail-reader.c:1402
 msgid "Print this message"
 msgstr "Imprime este mensaje"
 
-#: ../mail/e-mail-reader.c:1407
+#: ../mail/e-mail-reader.c:1409
 msgid "Preview the message to be printed"
 msgstr "Vista previa del mensaje que va a imprimirse"
 
-#: ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1414
 msgid "Re_direct"
 msgstr "Re_dirigir"
 
-#: ../mail/e-mail-reader.c:1414
+#: ../mail/e-mail-reader.c:1416
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirige (rebotar) el mensaje seleccionado a alguien"
 
-#: ../mail/e-mail-reader.c:1419
+#: ../mail/e-mail-reader.c:1421
 #: ../modules/calendar/e-cal-shell-view-actions.c:1459
 #: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../mail/e-mail-reader.c:1421
+#: ../mail/e-mail-reader.c:1423
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Responder a todos los destinatarios del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:1428
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: ../mail/e-mail-reader.c:1428
+#: ../mail/e-mail-reader.c:1430
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:1433
+#: ../mail/e-mail-reader.c:1435
 #: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/e-mail-reader.c:1435
+#: ../mail/e-mail-reader.c:1437
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responde al remitente del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:1440
+#: ../mail/e-mail-reader.c:1442
 msgid "_Save as mbox..."
 msgstr "_Guardar como mboxâ?¦"
 
-#: ../mail/e-mail-reader.c:1442
+#: ../mail/e-mail-reader.c:1444
 msgid "Save selected messages as an mbox file"
 msgstr "Guarda los mensajes como un archivo mbox"
 
-#: ../mail/e-mail-reader.c:1447
+#: ../mail/e-mail-reader.c:1449
 msgid "Search Folder from Mailing _List..."
 msgstr "Carpeta de bÃºsqueda segÃºn la l_ista de correoâ?¦"
 
-#: ../mail/e-mail-reader.c:1449
+#: ../mail/e-mail-reader.c:1451
 msgid "Create a search folder for this mailing list"
 msgstr "Crear una carpeta de bÃºsqueda para esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1454
+#: ../mail/e-mail-reader.c:1456
 msgid "Search Folder from Recipien_ts..."
 msgstr "Carpeta de bÃºsqueda segÃºn los des_tinatariosâ?¦"
 
-#: ../mail/e-mail-reader.c:1456
+#: ../mail/e-mail-reader.c:1458
 msgid "Create a search folder for these recipients"
 msgstr "Crear una carpeta de bÃºsqueda para estos destinatarios"
 
-#: ../mail/e-mail-reader.c:1461
+#: ../mail/e-mail-reader.c:1463
 msgid "Search Folder from Sen_der..."
 msgstr "Carpeta de bÃºsqueda segÃºn el r_emitenteâ?¦"
 
-#: ../mail/e-mail-reader.c:1463
+#: ../mail/e-mail-reader.c:1465
 msgid "Create a search folder for this sender"
 msgstr "Crear una carpeta de bÃºsqueda para este remitente"
 
-#: ../mail/e-mail-reader.c:1468
+#: ../mail/e-mail-reader.c:1470
 msgid "Search Folder from S_ubject..."
 msgstr "Carpeta de bÃºsqueda segÃºn el a_suntoâ?¦"
 
-#: ../mail/e-mail-reader.c:1470
+#: ../mail/e-mail-reader.c:1472
 msgid "Create a search folder for this subject"
 msgstr "Crear una carpeta de bÃºsqueda para este asunto"
 
-#: ../mail/e-mail-reader.c:1475
+#: ../mail/e-mail-reader.c:1477
 msgid "_Message Source"
 msgstr "Me_nsaje en bruto"
 
-#: ../mail/e-mail-reader.c:1477
+#: ../mail/e-mail-reader.c:1479
 msgid "Show the raw email source of the message"
 msgstr "Mostrar mensaje de correo-e en bruto"
 
-#: ../mail/e-mail-reader.c:1489
+#: ../mail/e-mail-reader.c:1491
 msgid "_Undelete Message"
 msgstr "_Recuperar mensaje"
 
-#: ../mail/e-mail-reader.c:1491
+#: ../mail/e-mail-reader.c:1493
 msgid "Undelete the selected messages"
 msgstr "Recupera los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1496
+#: ../mail/e-mail-reader.c:1498
 msgid "_Normal Size"
 msgstr "TamaÃ±o _normal"
 
-#: ../mail/e-mail-reader.c:1498
+#: ../mail/e-mail-reader.c:1500
 msgid "Reset the text to its original size"
 msgstr "Restablecer el texto a su tamaÃ±o original"
 
-#: ../mail/e-mail-reader.c:1503
+#: ../mail/e-mail-reader.c:1505
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:1505
+#: ../mail/e-mail-reader.c:1507
 msgid "Increase the text size"
 msgstr "Incrementar el tamaÃ±o del texto"
 
-#: ../mail/e-mail-reader.c:1510
+#: ../mail/e-mail-reader.c:1512
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:1512
+#: ../mail/e-mail-reader.c:1514
 msgid "Decrease the text size"
 msgstr "Reduce el tamaÃ±o del texto"
 
-#: ../mail/e-mail-reader.c:1519
+#: ../mail/e-mail-reader.c:1521
 msgid "Create R_ule"
 msgstr "Crear _regla"
 
-#: ../mail/e-mail-reader.c:1526
+#: ../mail/e-mail-reader.c:1528
 msgid "Ch_aracter Encoding"
 msgstr "C_odificaciÃ³n de caracteres"
 
-#: ../mail/e-mail-reader.c:1533
+#: ../mail/e-mail-reader.c:1535
 msgid "F_orward As"
 msgstr "Reenviar _como"
 
-#: ../mail/e-mail-reader.c:1540
+#: ../mail/e-mail-reader.c:1542
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:1547
+#: ../mail/e-mail-reader.c:1549
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:1554
+#: ../mail/e-mail-reader.c:1556
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: ../mail/e-mail-reader.c:1561
+#: ../mail/e-mail-reader.c:1563
 msgid "_Zoom"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:1586
+#: ../mail/e-mail-reader.c:1588
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimientoâ?¦"
 
-#: ../mail/e-mail-reader.c:1594
+#: ../mail/e-mail-reader.c:1596
 msgid "Mark as _Important"
 msgstr "Marcar como imp_ortante"
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1600
 msgid "Mark as _Junk"
 msgstr "Marcar como _SPAM"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1604
 msgid "Mark as _Not Junk"
 msgstr "Marcar como no _SPAM"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1608
 msgid "Mar_k as Read"
 msgstr "Marcar como _leÃdo"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1612
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como no imp_ortante"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1616
 msgid "Mark as _Unread"
 msgstr "Marcar como no _leÃdo"
 
-#: ../mail/e-mail-reader.c:1650
+#: ../mail/e-mail-reader.c:1652
 msgid "_Caret Mode"
 msgstr "Activar cu_rsor"
 
-#: ../mail/e-mail-reader.c:1652
+#: ../mail/e-mail-reader.c:1654
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostrar un cursor parpadeante en el cuerpo de los mensajes mostrados"
 
-#: ../mail/e-mail-reader.c:1658
+#: ../mail/e-mail-reader.c:1660
 msgid "All Message _Headers"
 msgstr "_Todas las cabeceras del mensaje"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:1662
 msgid "Show messages with all email headers"
 msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
 
-#: ../mail/e-mail-reader.c:1882
+#: ../mail/e-mail-reader.c:1884
 msgid "Unable to retrieve message"
 msgstr "No se pudo obtener el mensaje"
 
-#: ../mail/e-mail-reader.c:1886 ../mail/e-mail-reader.c:1946
-#: ../mail/mail-ops.c:1843
+#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1948
+#: ../mail/mail-ops.c:1842
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Obteniendo mensaje Â«%sÂ»"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2464 ../mail/mail-config.ui.h:30
+#: ../mail/e-mail-reader.c:2466 ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
@@ -10178,33 +10120,33 @@ msgstr "Obteniendo mensaje Â«%sÂ»"
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/e-mail-reader.c:2585
+#: ../mail/e-mail-reader.c:2596
 #: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../mail/e-mail-reader.c:2586
+#: ../mail/e-mail-reader.c:2597
 msgid "Forward the selected message to someone"
 msgstr "ReenvÃa a alguien el mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:2631 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2642 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:2639
+#: ../mail/e-mail-reader.c:2650
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../mail/e-mail-reader.c:2643
+#: ../mail/e-mail-reader.c:2654
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:2653 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:2664 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Responder"
 
@@ -10214,7 +10156,7 @@ msgstr "Marcar para seguimiento"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:74
+#: ../mail/em-account-editor.c:506 ../mail/mail-config.ui.h:75
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Sin cifrado"
@@ -10222,7 +10164,7 @@ msgstr "Sin 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:503 ../mail/mail-config.ui.h:128
+#: ../mail/em-account-editor.c:510 ../mail/mail-config.ui.h:131
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
@@ -10230,17 +10172,17 @@ 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:507 ../mail/mail-config.ui.h:99
+#: ../mail/em-account-editor.c:514 ../mail/mail-config.ui.h:100
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acuerdo de licencia %s"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:608
 #, c-format
 msgid ""
 "\n"
@@ -10254,34 +10196,34 @@ msgstr ""
 "y marque la casilla para aceptarlo.\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:885 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:895 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../mail/em-account-editor.c:969
+#: ../mail/em-account-editor.c:979
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:970
+#: ../mail/em-account-editor.c:980
 msgid "Always"
 msgstr "Siempre"
 
-#: ../mail/em-account-editor.c:971
+#: ../mail/em-account-editor.c:981
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaje"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1718 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../mail/em-account-editor.c:2083
+#: ../mail/em-account-editor.c:2093
 msgid "Mail Configuration"
 msgstr "ConfiguraciÃ³n del correo"
 
-#: ../mail/em-account-editor.c:2084
+#: ../mail/em-account-editor.c:2094
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10291,7 +10233,7 @@ msgstr ""
 "\n"
 "Pulse Â«AdelanteÂ» para comenzar. "
 
-#: ../mail/em-account-editor.c:2087
+#: ../mail/em-account-editor.c:2097
 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 "
@@ -10301,20 +10243,20 @@ msgstr ""
 "hace falta que los rellene, a menos que quiera incluir esta informaciÃ³n en "
 "el correo-e que envÃe."
 
-#: ../mail/em-account-editor.c:2089 ../mail/em-account-editor.c:2256
-#: ../mail/mail-config.ui.h:92
+#: ../mail/em-account-editor.c:2099 ../mail/em-account-editor.c:2266
+#: ../mail/mail-config.ui.h:93
 msgid "Receiving Email"
 msgstr "RecepciÃ³n de correo"
 
-#: ../mail/em-account-editor.c:2090
+#: ../mail/em-account-editor.c:2100
 msgid "Please configure the following account settings."
 msgstr "Configure las siguientes opciones de la cuenta."
 
-#: ../mail/em-account-editor.c:2092 ../mail/em-account-editor.c:2727
+#: ../mail/em-account-editor.c:2102 ../mail/em-account-editor.c:2737
 msgid "Sending Email"
 msgstr "EnvÃo de correo"
 
-#: ../mail/em-account-editor.c:2093
+#: ../mail/em-account-editor.c:2103
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10323,11 +10265,11 @@ msgstr ""
 "seguro, pregÃºntele a su administrador de sistemas o a su Proveedor de "
 "Servicios de Internet."
 
-#: ../mail/em-account-editor.c:2095
+#: ../mail/em-account-editor.c:2105
 msgid "Account Management"
 msgstr "AdministraciÃ³n de cuentas"
 
-#: ../mail/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2106
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10335,11 +10277,11 @@ msgstr ""
 "Introduzca un nombre descriptivo para esta cuenta en el espacio de abajo.\n"
 "Este nombre se usarÃ¡ sÃ³lo para mostrarlo."
 
-#: ../mail/em-account-editor.c:2100
+#: ../mail/em-account-editor.c:2110
 msgid "Done"
 msgstr "Hecho"
 
-#: ../mail/em-account-editor.c:2101
+#: ../mail/em-account-editor.c:2111
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10353,25 +10295,30 @@ msgstr ""
 "\n"
 "Pulse Â«AplicarÂ» para guardar su configuraciÃ³n."
 
-#: ../mail/em-account-editor.c:2543
+#: ../mail/em-account-editor.c:2553
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay mensajes _nuevos cada"
 
-#: ../mail/em-account-editor.c:2551
+#: ../mail/em-account-editor.c:2561
 msgid "minu_tes"
 msgstr "minuto_s"
 
-#: ../mail/em-account-editor.c:2914 ../mail/mail-config.ui.h:106
+#: ../mail/em-account-editor.c:2835
+#| msgid "Please select an image for this contact"
+msgid "Please select a folder from the current account."
+msgstr "Seleccionar una carpeta de la cuenta actual."
+
+#: ../mail/em-account-editor.c:3105 ../mail/mail-config.ui.h:107
 msgid "Security"
 msgstr "Seguridad"
 
 #. 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:2959 ../mail/em-account-editor.c:3027
+#: ../mail/em-account-editor.c:3150 ../mail/em-account-editor.c:3218
 msgid "Receiving Options"
 msgstr "Opciones de recepciÃ³n"
 
-#: ../mail/em-account-editor.c:2960 ../mail/em-account-editor.c:3028
+#: ../mail/em-account-editor.c:3151 ../mail/em-account-editor.c:3219
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
@@ -10531,7 +10478,7 @@ msgstr "no estÃ¡ configurado"
 msgid "is set"
 msgstr "estÃ¡ configurado"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:64
 msgid "Junk"
 msgstr "SPAM"
 
@@ -10728,12 +10675,12 @@ msgstr "NO COINCIDENTE"
 msgid "Loading..."
 msgstr "Cargandoâ?¦"
 
-#: ../mail/em-folder-tree.c:183
+#: ../mail/em-folder-tree.c:184
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en Â«%sÂ»"
 
-#: ../mail/em-folder-tree.c:596
+#: ../mail/em-folder-tree.c:597
 msgid "Folder names cannot contain '/'"
 msgstr "Los nombres de carpetas no pueden contener el carÃ¡cter Â«/Â»"
 
@@ -10755,37 +10702,37 @@ msgstr "Los nombres de carpetas no pueden contener el carÃ¡cter Â«/Â»"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1078
+#: ../mail/em-folder-tree.c:1079
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1286
+#: ../mail/em-folder-tree.c:1287
 msgid "Mail Folder Tree"
 msgstr "Ã?rbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:1583 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1593 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1585 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1595 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1592 ../mail/message-list.c:2106
+#: ../mail/em-folder-tree.c:1602 ../mail/message-list.c:2153
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1594 ../mail/message-list.c:2108
+#: ../mail/em-folder-tree.c:1604 ../mail/message-list.c:2155
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1609
+#: ../mail/em-folder-tree.c:1619
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se puede dejar el(los) mensaje(s) en el almacÃ©n de nivel superior"
 
@@ -11078,7 +11025,7 @@ msgstr "Mensajes de %s"
 msgid "Search _Folders"
 msgstr "Carpetas de _bÃºsqueda"
 
-#: ../mail/em-vfolder-rule.c:521
+#: ../mail/em-vfolder-rule.c:525
 msgid "Add Folder"
 msgstr "AÃ±adir carpeta"
 
@@ -11394,14 +11341,28 @@ msgstr ""
 "definido en la clave Â«message_text_part_limitÂ»."
 
 #: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:66
+#, fuzzy
+#| msgid ""
+#| "Enable this to use Space bar key to scroll in message preview, message "
+#| "list and folders."
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+"Activar esto para usar la barra espaciadora para desplazarse en la vista "
+"previa del mensaje, lista de mensajes y carpetas."
+
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:47
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar nombres de archivo de la forma Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 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, "
@@ -11413,19 +11374,23 @@ msgstr ""
 "localizados enviados por Evolution, ya que no siguen el RFC 2231, pero usan "
 "el estÃ¡ndar incorrecto RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Height of the message-list pane"
 msgstr "Altura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane."
 msgstr "Altura del panel de vista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta la vista previa por carpeta y elimina la selecciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11433,7 +11398,7 @@ msgstr ""
 "Si el usuario intenta abrir diez o mÃ¡s mensajes al mismo tiempo, preguntar "
 "al usuario si quiere realmente hacerlo."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:75
 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 "
@@ -11444,7 +11409,7 @@ msgstr ""
 "visor de componentes bonobo en la base de datos de GNOME puede usarse para "
 "mostrar el contenido."
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -11452,7 +11417,7 @@ msgstr ""
 "Altura inicial de la ventana Â«Editor de filtrosÂ». El valor se actualiza segÃºn "
 "el usuario redimensiona verticalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11460,7 +11425,7 @@ msgstr ""
 "Altura inicial de la ventana Â«Editor de carpetas de bÃºsquedaÂ». El valor se "
 "actualiza segÃºn el usuario redimensiona verticalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11468,7 +11433,7 @@ msgstr ""
 "Altura inicial de la ventana Â«Enviar y recibir correoÂ». El valor se actualiza "
 "segÃºn el usuario redimensiona verticalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11480,7 +11445,7 @@ msgstr ""
 "usa este valor en particular ya que la ventana Â«Editor de filtrosÂ» no se "
 "puede maximizar. Esta clave existe sÃ³lo como un detalle de implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11493,7 +11458,7 @@ msgstr ""
 "carpetas de bÃºsquedaÂ» no se puede maximizar. Esta clave existe sÃ³lo como un "
 "detalle de implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11507,7 +11472,7 @@ msgstr ""
 "no se puede maximizar. Esta clave existe sÃ³lo como un detalle de "
 "implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -11515,7 +11480,7 @@ msgstr ""
 "Anchura inicial de la ventana Â«Editor de filtrosÂ». El valor se actualiza "
 "segÃºn el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11523,7 +11488,7 @@ msgstr ""
 "Anchura inicial de la ventana Â«Editor de carpetas de bÃºsquedaÂ». El valor se "
 "actualiza segÃºn el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11531,7 +11496,7 @@ msgstr ""
 "Anchura inicial de la ventana Â«Enviar y recibir correoÂ». El valor se "
 "actualiza segÃºn el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:85
 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 "
@@ -11541,35 +11506,35 @@ msgstr ""
 "mensajes de una carpeta de bÃºsqueda borra permanentemente el mensaje, no "
 "sÃ³lo los elimina de los resultados de la bÃºsqueda."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Last time Empty Junk was run"
 msgstr "Ã?ltima vez que se vaciÃ³ el SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Last time Empty Trash was run"
 msgstr "Ã?ltima vez que se vaciÃ³ la papelera"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Layout style"
 msgstr "Estilo de la distribuciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Lista de tipos MIME de comprobaciÃ³n de visores de componentes Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11578,16 +11543,16 @@ msgstr ""
 "lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceras personalizadas y si estÃ¡n activadas."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista de los cÃ³digos de diccionario usados para la correcciÃ³n ortogrÃ¡fica."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:97
 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."
@@ -11596,15 +11561,15 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificaciÃ³n "
 "hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nombres de protocolos cuya licencia ha sido aceptada."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Load images for HTML messages over HTTP"
 msgstr "Cargar imÃ¡genes para mensajes HTML sobre HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:100
 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 "
@@ -11615,174 +11580,174 @@ msgstr ""
 "remitente estÃ¡ en la libreta de direcciones; Â«2Â»: Siempre cargar imÃ¡genes "
 "desde la red."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mail browser height"
 msgstr "Altura del examinador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mail browser maximized"
 msgstr "Examinador de correo maximizado"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mail browser width"
 msgstr "Anchura del examinador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despuÃ©s del tiempo especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despuÃ©s del tiempo especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuales en la vista previa del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la Â«vista previaÂ» del mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Message text limit for display"
 msgstr "LÃmite del texto del mensaje para mostrarlo"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualizaciÃ³n del mensaje (\"normal\", \"full headers\" (cabeceras "
 "completas), \"source\" (fuente))"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum days between emptying the junk on exit"
 msgstr "DÃas mÃnimos entre el vaciado del SPAM a la salida"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Minimum days between emptying the trash on exit"
 msgstr "DÃas mÃnimos entre el vaciado de la papelera a la salida"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tiempo mÃnimo entre el vaciado del SPAM a la salida, en dÃas."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tiempo mÃnimo entre el vaciado de la papelera a la salida, en dÃas."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "NÃºmero de direcciones a mostrar en PARA/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto estÃ¡ en blanco"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intente purgar una carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un mensaje sin un asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar al eliminar mensajes en carpetas de bÃºsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacte"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sÃ³lo rellene el campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Preguntar cuando el usuario intente abrir diez o mÃ¡s mensajes a la vez"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar al enviar mensajes en HTML a contactos quizÃ¡ no los quieran."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cuando el usuario intente enviar un mensaje sin destinatarios Para "
 "o Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intente enviar HTML no deseado"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cuando se marquen varios mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Put personalized signatures at the top of replies"
 msgstr "Poner firmas personalizas en la parte superior de las respuestas"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Put the cursor at the bottom of replies"
 msgstr "Comenzar a escribir en la parte final al responder"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Reconocer emoticonos en el texto y reemplazarlos con imÃ¡genes."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Run junk test on incoming mail."
 msgstr "Ejecutar la prueba de SPAM en el correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Save directory"
 msgstr "Directorio donde guardar"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Search for the sender photo in local address books"
 msgstr "Buscar la foto del remitente en libretas de direcciones locales"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML de forma predeterminada"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Send HTML mail by default."
 msgstr "Enviar el correo en HTML de forma predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Sender email-address column in the message list"
 msgstr "Columna del correo-e del remitente en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronizaciÃ³n con el servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11790,63 +11755,63 @@ msgstr ""
 "EstablÃ©zcalo a verdadero si no quiere aÃ±adir un delimitador de firma antes "
 "de su firma al editar un correo."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar el campo Â«CcoÂ» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostrar el campo Â«CcÂ» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar el campo Â«DeÂ» al publicar en un grupo de noticias"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Mostrar el campo Â«Responder aÂ» al publicar en un grupo de noticias"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostrar el campo Â«Responder aÂ» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show all message headers"
 msgstr "Mostrar todas las cabeceras del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostrar todas las cabeceras al ver mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show animated images as animations."
 msgstr "Mostrar las imÃ¡genes animadas como animaciones."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar los mensajes borrados (tachados) en la lista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar los mensajes borrados en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show image animations"
 msgstr "Mostrar imÃ¡genes animadas"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar el valor original de la cabecera Â«FechaÂ»."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show photo of the sender"
 msgstr "Mostrar la foto del remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11854,7 +11819,7 @@ msgstr ""
 "Mostrar el campo Â«CcoÂ» al enviar un mensaje de correo. Esto se controla desde "
 "el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11862,7 +11827,7 @@ msgstr ""
 "Mostrar el campo Â«CcÂ» al enviar un mensaje de correo. Esto se controla desde "
 "el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11870,7 +11835,7 @@ msgstr ""
 "Mostrar el campo Â«DeÂ» al enviar un mensaje de correo. Esto se controla desde "
 "el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11878,7 +11843,7 @@ msgstr ""
 "Mostrar el campo Â«Responder aÂ» al publicar en un grupo de noticias. Esto se "
 "controla desde el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11886,7 +11851,7 @@ msgstr ""
 "Mostrar el campo Â«Responder aÂ» al enviar un mensaje de correo. Esto se "
 "controla desde el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -11894,7 +11859,7 @@ msgstr ""
 "Mostrar el correo-e del remitente en una columna separada en la lista de "
 "mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:162
 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 "
@@ -11905,53 +11870,53 @@ msgstr ""
 "cabecera Â«FechaÂ» en el formato preferido por el usuario para la fecha y hora "
 "locales."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar la foto del remitente en el panel de lectura de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell check inline"
 msgstr "ComprobaciÃ³n ortogrÃ¡fica en lÃnea"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking color"
 msgstr "Color de la correcciÃ³n ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Spell checking languages"
 msgstr "ComprobaciÃ³n ortogrÃ¡fica de idiomas"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada del diÃ¡logo de suscripciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Subscribe dialog default width"
 msgstr "Anchura predeterminada del diÃ¡logo de suscripciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Terminal font"
 msgstr "TipografÃa del terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The default plugin for Junk hook"
 msgstr "El complemento predeterminado para SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "La Ãºltima vez que se vaciÃ³ el SPAM, en dÃas desde el 1 de enero de 1970 "
 "(Ã©poca)."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "La Ãºltima vez que se vaciÃ³ la papelera, en dÃas desde el 1 de enero de 1970 "
 "(Ã©poca)."
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:173
 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 "
@@ -11963,15 +11928,15 @@ msgstr ""
 "vista previa debajo de la lista de correos. Â«1Â» (vista vertical) ubica el "
 "panel de vista previa junto a la lista de correos."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The terminal font for mail display."
 msgstr "La tipografÃa de terminal para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "The variable width font for mail display."
 msgstr "La tipografÃa de anchura variable para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11979,7 +11944,7 @@ msgstr ""
 "Esto puede tener tres valores posibles. Â«0Â» para errores. Â«1Â» para avisos. Â«2Â» "
 "para mensajes de depuraciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:177
 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 "
@@ -11990,7 +11955,7 @@ msgstr ""
 "(4MiB). Este valor sÃ³lo se usa cuando la clave 'force_message_limit' estÃ¡ "
 "activada."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:178
 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 "
@@ -12000,7 +11965,7 @@ msgstr ""
 "varios complementos activados. Si el complemento predeterminado listado estÃ¡ "
 "desactivado, entonces no usarÃ¡ los otros complementos disponibles."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:179
 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."
@@ -12009,7 +11974,7 @@ msgstr ""
 "Esto deselecciona el correo en la lista y elimina la vista previa para esa "
 "carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:180
 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;"
@@ -12021,7 +11986,7 @@ msgstr ""
 "estructura XML es &lt;header enabled&gt;: poner a activado si la cabecera se "
 "debe mostrar en la vista de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:181
 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 "
@@ -12032,11 +11997,11 @@ msgstr ""
 "local para excluir de los filtros de correo basura el correo enviado por "
 "contactos conocidos."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opciÃ³n ayudarÃ¡ a mejorar la velocidad de obtenciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12044,7 +12009,7 @@ msgstr ""
 "Esto establece el nÃºmero de direcciones a mostrar en la vista de lista de "
 "mensajes predeterminada, mÃ¡s allÃ¡ de los cuales se muestra un Â«â?¦Â»."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12053,7 +12018,7 @@ msgstr ""
 "deberÃan estar en estado expandido o contraÃdo. Evolution necesita "
 "reiniciarse."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:185
 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 "
@@ -12063,53 +12028,53 @@ msgstr ""
 "Ãºltimo mensaje de cada conversaciÃ³n, en lugar de por la fecha del mensaje. "
 "Evolution necesita un reinicio."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Thread the message-list based on Subject"
 msgstr "Agrupar la lista de mensajes en conversaciones basadas en el asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen"
 msgstr "Tiempo para marcar un mensaje como visto"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Timeout for marking message as seen."
 msgstr "Tiempo para marcar un mensaje como visto."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Color de subrayado para las palabras mal escritas cuando se use correcciÃ³n "
 "en lÃnea."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar el demonio y cliente de SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usar el demonio y cliente de SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts"
 msgstr "Usar tipografÃa personalizada"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipografÃa personalizada para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only local spam tests."
 msgstr "Usar sÃ³lo comprobaciones de SPAM locales."
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usa sÃ³lo comprobaciones de SPAM locales (sin DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:197
 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 "
@@ -12119,7 +12084,7 @@ msgstr ""
 "mensaje. Esto determina si el cursor se posiciona en la parte superior del "
 "mensaje o en la inferior."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:198
 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 "
@@ -12129,23 +12094,23 @@ msgstr ""
 "mensaje. Esto determina si la firma se ubica en la parte superior del "
 "mensaje o en la inferior."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Variable width font"
 msgstr "TipografÃa de anchura variable"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Indica si se debe aÃ±adir una solicitud de lectura de forma predeterminada a "
 "cada mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Indica si se debe desactivar la caracterÃstica de elipsis de los nombres de "
 "las carpetas en la barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12153,17 +12118,24 @@ msgstr ""
 "Indica si se debe o no volver al agrupado de conversaciones por asuntos "
 "cuando los mensajes no contienen cabeceras Â«In-Reply-ToÂ» o Â«ReferencesÂ»."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indica si ordenar las conversaciones basÃ¡ndose en el Ãºltimo mensaje de esa "
 "conversaciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:204
+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 "
+"one minute after the last action invocation."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Width of the message-list pane"
 msgstr "Anchura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Width of the message-list pane."
 msgstr "Anchura del panel de lista de mensajes."
 
@@ -12171,7 +12143,7 @@ msgstr "Anchura del panel de lista de mensajes."
 msgid "Importing Elm data"
 msgstr "Importando datos de Elm"
 
-#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:499
@@ -12238,20 +12210,20 @@ msgstr "Importando Â«%sÂ»"
 msgid "Scanning %s"
 msgstr "Analizando %s"
 
-#: ../mail/importers/pine-importer.c:219
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "Importando datos de Pine"
 
-#: ../mail/importers/pine-importer.c:377
+#: ../mail/importers/pine-importer.c:405
 #: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: ../mail/importers/pine-importer.c:419
+#: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
 msgstr "Importador de Pine de Evolution"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
 msgstr "Importar correo de Pine."
 
@@ -12341,412 +12313,426 @@ msgstr "Siempre cifrar a _mÃ mismo cuando envÃe correo cifrado"
 msgid "Always request rea_d receipt"
 msgstr "Siempre _solicitar confirmaciÃ³n de lectura"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr "Aplicar los mismos ajustes de _vista a todas las carpetas"
+
+#: ../mail/mail-config.ui.h:16
 #: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "AutenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
 msgstr "Insertar imÃ¡genes de _emoticonos automÃ¡ticamente"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
 msgstr "Conjunto de carac_teres:"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Ch_eck for Supported Types"
 msgstr "C_omprobar tipos soportados"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
 msgstr "Compro_bar las cabeceras personalizadas contra SPAM"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar si los _mensajes entrantes son basura"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "Comprobar orto_grafÃa mientras se escribe"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Comprueba si los mensajes de correo entrantes son SPAM"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "_Vaciar"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "Vacia_r"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras _mal escritas:"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "Redactar mensajes"
 
-#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 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 purgar una carpeta"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "Comportamiento predeterminado"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 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 correo-e"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar los mensajes SPAM al _salir"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Firmar digitalmente los mensajes s_alientes (por omisiÃ³n)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "Cabeceras mostradas del mensaje"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not display messages when text si_ze exceeds"
 msgstr "No mostrar mensajes si el tama_Ã±o del texto excede"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "_No marcar los mensajes como basura si el remitente estÃ¡ en mi libreta de "
 "direcciones"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Do not quote"
 msgstr "No entrecomillar"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
 msgstr "Carpeta de _borradores:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
 msgstr "Dir_ecciÃ³n de correo-e:"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "Vaciar _papelera al salir"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
 msgstr "Activar la barra e_spaciadora mÃ¡gica"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
 msgstr "Activar las Carpetas de _bÃºsqueda"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_frado:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
 msgstr "Cifrar mensajes _salientes (por omisiÃ³n)"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
 msgstr "Anchura _fija:"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Fix_ed width Font:"
 msgstr "TipografÃa de anchura _fija:"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Font Properties"
 msgstr "Propiedades de tipografÃas"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
 msgstr "Dar formato _HTML a los mensajes"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "Nombre co_mpleto:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "HTML Messages"
 msgstr "Mensajes HTML"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:59
 msgid "Headers"
 msgstr "Cabeceras"
 
 # Esta cadena debe permanecer asÃ
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Highlight _quotations with"
 msgstr "Resaltar texto _citado con este color:"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:62
 msgid "Inline"
 msgstr "En lÃnea"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "Inline (Outlook style)"
 msgstr "En lÃnea (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "KB"
 msgstr "Kib"
 
-#: ../mail/mail-config.ui.h:65 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:66 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "Languages Table"
 msgstr "Tabla de idiomas"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Loading Images"
 msgstr "Cargando imÃ¡genes"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Mail Headers Table"
 msgstr "Tabla de cabeceras de correo"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid "Mailbox location"
 msgstr "DirecciÃ³n del buzÃ³n"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "Message Display"
 msgstr "Mostrado de mensajes"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "Message Fonts"
 msgstr "TipografÃas del mensaje"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:73
 msgid "Message Receipts"
 msgstr "Destinatarios del mensaje"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:74
 msgid "No _Proxy for:"
 msgstr "Sin _proxy para:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Nota: No se le pedirÃ¡ una contraseÃ±a hasta que conecte por primera vez"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:77
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Esta opciÃ³n se omitirÃ¡ si se encuentra alguna coincidencia para una cabecera "
 "de SPAM personalizada."
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "InformaciÃ³n opcional"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Or_ganization:"
 msgstr "Organi_zaciÃ³n:"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Pass_word:"
 msgstr "_ContraseÃ±a:"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Port:"
 msgstr "Puerto:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:85
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preguntar al enviar mensajes que tan sÃ³lo tengan definido el _Cco"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Printed Fonts"
 msgstr "TipografÃas imprimidas"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "Proxy Settings"
 msgstr "Ajustes del proxy"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:91
 msgid "Re_member password"
 msgstr "_Recordar contraseÃ±a"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:94
 msgid "Remember _password"
 msgstr "Recordar contrase_Ã±a"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "Required Information"
 msgstr "InformaciÃ³n requerida"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "SSL is not supported in this build of Evolution"
 msgstr "Esta compilaciÃ³n de Evolution no soporta SSL"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Bu_scar la foto del remitente sÃ³lo en libretas de direcciones locales"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "S_elect..."
 msgstr "S_eleccionarâ?¦"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "S_end message receipts:"
 msgstr "_Enviar confirmaciones de mensajes:"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "S_tandard Font:"
 msgstr "TipografÃa _estÃ¡ndar:"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "Select Drafts Folder"
 msgstr "Seleccionar la carpeta de borradores"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:112
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
+#| msgid "Select Folder"
+msgid "Select Junk Folder"
+msgstr "Seleccionar carpeta de SPAM"
+
+#: ../mail/mail-config.ui.h:114
 msgid "Select Sent Folder"
 msgstr "Seleccionar la carpeta de enviados"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
+#| msgid "Select Drafts Folder"
+msgid "Select Trash Folder"
+msgstr "Seleccionar la carpeta de papelera"
+
+#: ../mail/mail-config.ui.h:116
 msgid "Sender Photograph"
 msgstr "Foto del remitente"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 msgid "Sending Mail"
 msgstr "EnvÃo de correo"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:118
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:119
 msgid "Sent and Draft Messages"
 msgstr "Mensajes enviados y borradores"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:120
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:121
 msgid "Server Configuration"
 msgstr "ConfiguraciÃ³n del servidor"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:122
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:123
 msgid "Si_gning algorithm:"
 msgstr "Algoritmo de _firma:"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:124
 msgid "Sig_natures"
 msgstr "_Firmas"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:125
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _firma:"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:126
 msgid "Signat_ure:"
 msgstr "_Firma:"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:127
 msgid "Signatures"
 msgstr "Firmas"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:128
 msgid "Signing _algorithm:"
 msgstr "_Algoritmo de firma:"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:129
 msgid "Spell Checking"
 msgstr "OrtografÃa"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:130
 msgid "Start _typing at the bottom on replying"
 msgstr "Comenzar a _escribir en la parte final al responder"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:132
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12754,7 +12740,7 @@ msgstr ""
 "La lista de idiomas de aquÃ refleja Ãºnicamente los idiomas para los cuÃ¡les "
 "hay instalado un diccionario."
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:134
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12765,11 +12751,11 @@ msgstr ""
 "para mostrarlo por pantalla. "
 
 #. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:138
 msgid "Top Posting Option"
 msgstr "OpciÃ³n de publicar por encima"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:139
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12777,160 +12763,170 @@ msgstr ""
 "Teclee el nombre por el que quiere identificar a esta cuenta.\n"
 "Por ejemplo: Â«TrabajoÂ» o Â«PersonalÂ»"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:141
 msgid "Us_ername:"
 msgstr "_Usuario:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:142
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:140 ../plugins/caldav/caldav-source.c:225
+#: ../mail/mail-config.ui.h:143 ../plugins/caldav/caldav-source.c:225
 #: ../plugins/google-account-setup/google-contacts-source.c:286
 #: ../plugins/google-account-setup/google-source.c:623
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "_Usuario:"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:144
 msgid "V_ariable-width:"
 msgstr "An_chura variable:"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:145
 msgid "_Add Signature"
 msgstr "_AÃ±adir firma"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:146
 msgid "_Always load images from the Internet"
 msgstr "_Siempre cargar las imÃ¡genes desde Internet"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:147
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:148
 msgid "_Default junk plugin:"
 msgstr "Complemento SPAM pre_determinado:"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:149
 msgid "_Direct connection to the Internet"
 msgstr "ConexiÃ³n _directa a Internet"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:150
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "No _firmar las solicitudes de reuniÃ³n (para compatibilidad con Outlook)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:151
 msgid "_Forward style:"
 msgstr "_Estilo de reenvÃo:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:152
+#| msgid "Current Folder"
+msgid "_Junk Folder:"
+msgstr "Carpeta de _SPAM:"
+
+#: ../mail/mail-config.ui.h:153
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Mantener la firma por encima del mensaje original al responder"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:154
 msgid "_Languages"
 msgstr "_Idiomas"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:155
 msgid "_Load images in messages from contacts"
 msgstr "_Cargar imÃ¡genes en los mensajes de mis contactos"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:156
 msgid "_Lookup in local address book only"
 msgstr "_Buscar sÃ³lo en la libreta de direcciones local"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:157
 msgid "_Make this my default account"
 msgstr "_Hacer que Ã©sta sea mi cuenta predeterminada"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:158
 msgid "_Manual proxy configuration:"
 msgstr "ConfiguraciÃ³n _manual del proxy:"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:159
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leÃdos tras"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:161
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar imÃ¡genes desde Internet"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:162
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:163
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Preguntar al enviar mensajes en HTML a contactos que no los quieren"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:164
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al enviar mensajes con el asunto vacÃo"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:165
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:166
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:167
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:169 ../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:167
+#: ../mail/mail-config.ui.h:171
 msgid "_Show image animations"
 msgstr "_Mostrar animaciones"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:172
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar la foto del remitente en la vista previa del mensaje"
 
 #. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:174
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir las cabeceras Para / Cc / Cco a "
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:175
+#| msgid "Drafts _Folder:"
+msgid "_Trash Folder:"
+msgstr "Carpeta de p_apelera:"
+
+#: ../mail/mail-config.ui.h:176
 msgid "_Use Secure Connection:"
 msgstr "Usar cone_xiÃ³n segura:"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:177
 msgid "_Use system defaults"
 msgstr "_Usar los valores predeterminados del sistema"
 
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:178
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografÃas que en otras aplicaciones"
 
-#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:179 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "am"
 
 #. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:181
 msgid "addresses"
 msgstr "direcciones"
 
-#: ../mail/mail-config.ui.h:177 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:182 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "por"
 
 # Esta traducciÃ³n debe mantenerse asÃ
-#: ../mail/mail-config.ui.h:178
+#: ../mail/mail-config.ui.h:183
 msgid "color"
 msgstr "color"
 
-#: ../mail/mail-config.ui.h:179
+#: ../mail/mail-config.ui.h:184
 msgid "description"
 msgstr "descripciÃ³n"
 
@@ -13050,7 +13046,7 @@ msgstr "_Marca:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque esto para aceptar el acuerdo de licencia"
 
-#: ../mail/mail-folder-cache.c:754
+#: ../mail/mail-folder-cache.c:762
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
@@ -13064,12 +13060,12 @@ msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:576
+#: ../mail/mail-ops.c:575
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No se pudieron aplicar los filtros al correo saliente: %s"
 
-#: ../mail/mail-ops.c:588 ../mail/mail-ops.c:616
+#: ../mail/mail-ops.c:587 ../mail/mail-ops.c:615
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13078,126 +13074,126 @@ msgstr ""
 "FallÃ³ al anexar a %s: %s\n"
 "En su lugar se anexarÃ¡ a la carpeta local Â«Correo enviadoÂ»."
 
-#: ../mail/mail-ops.c:633
+#: ../mail/mail-ops.c:632
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "FallÃ³ anexar a la carpeta local Â«Correo enviadoÂ»: %s"
 
-#: ../mail/mail-ops.c:744 ../mail/mail-ops.c:825
+#: ../mail/mail-ops.c:743 ../mail/mail-ops.c:824
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: ../mail/mail-ops.c:754
+#: ../mail/mail-ops.c:753
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: ../mail/mail-ops.c:781
+#: ../mail/mail-ops.c:780
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "FallÃ³ al enviar %d de %d mensajes"
 
-#: ../mail/mail-ops.c:783 ../mail/mail-send-recv.c:761
+#: ../mail/mail-ops.c:782 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:785 ../mail/mail-send-recv.c:763
+#: ../mail/mail-ops.c:784 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:897
+#: ../mail/mail-ops.c:896
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Guardando mensaje en la carpeta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:974
+#: ../mail/mail-ops.c:973
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Moviendo mensajes a Â«%sÂ»"
 
-#: ../mail/mail-ops.c:974
+#: ../mail/mail-ops.c:973
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando mensajes a Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1083
+#: ../mail/mail-ops.c:1082
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Analizando carpetas en Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1191
+#: ../mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Mensajes reenviados"
 
-#: ../mail/mail-ops.c:1232
+#: ../mail/mail-ops.c:1231
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Abriendo carpeta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1298
+#: ../mail/mail-ops.c:1297
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Obteniendo la informaciÃ³n de la cuota para la carpeta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1370
+#: ../mail/mail-ops.c:1369
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Abriendo almacÃ©n Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1441
+#: ../mail/mail-ops.c:1440
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Eliminando carpeta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1561
+#: ../mail/mail-ops.c:1560
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1624
+#: ../mail/mail-ops.c:1623
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1625
+#: ../mail/mail-ops.c:1624
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1679
+#: ../mail/mail-ops.c:1678
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando carpeta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1719
+#: ../mail/mail-ops.c:1718
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Compactando carpeta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1764
+#: ../mail/mail-ops.c:1763
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1765
+#: ../mail/mail-ops.c:1764
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: ../mail/mail-ops.c:1961
+#: ../mail/mail-ops.c:1960
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Descargando %d mensaje"
 msgstr[1] "Descargando %d mensajes"
 
-#: ../mail/mail-ops.c:2050
+#: ../mail/mail-ops.c:2049
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
-#: ../mail/mail-ops.c:2131
+#: ../mail/mail-ops.c:2130
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13206,11 +13202,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2203
+#: ../mail/mail-ops.c:2202
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: ../mail/mail-ops.c:2221 ../mail/mail-ops.c:2229
+#: ../mail/mail-ops.c:2220 ../mail/mail-ops.c:2228
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13219,27 +13215,27 @@ msgstr ""
 "No es posible crear el archivo de salida: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2244
+#: ../mail/mail-ops.c:2243
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No es posible escribir datos: %s"
 
-#: ../mail/mail-ops.c:2389
+#: ../mail/mail-ops.c:2388
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Desconectando de Â«%sÂ»"
 
-#: ../mail/mail-ops.c:2389
+#: ../mail/mail-ops.c:2388
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "ReconectÃ¡ndose con Â«%sÂ»"
 
-#: ../mail/mail-ops.c:2485
+#: ../mail/mail-ops.c:2484
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando la cuenta Â«%sÂ» para desconexiÃ³n"
 
-#: ../mail/mail-ops.c:2571
+#: ../mail/mail-ops.c:2570
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
@@ -13268,36 +13264,36 @@ msgstr "Esperandoâ?¦"
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduzca la contraseÃ±a para %s"
 
-#: ../mail/mail-session.c:221
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "Introduzca la contraseÃ±a"
 
-#: ../mail/mail-session.c:224
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseÃ±a para %s"
 
-#: ../mail/mail-session.c:226
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "Introduzca contraseÃ±a"
 
-#: ../mail/mail-session.c:268
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "El usuario cancelÃ³ la operaciÃ³n."
 
-#: ../mail/mail-session.c:678
+#: ../mail/mail-session.c:701
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "No se proporcionÃ³ ninguna direcciÃ³n de destino, se cancelÃ³ el reenvÃo del "
 "mensaje."
 
-#: ../mail/mail-session.c:684
+#: ../mail/mail-session.c:707
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "No se encontrÃ³ ninguna cuenta que usar, se cancelÃ³ el reenvÃo del mensaje."
@@ -13977,82 +13973,82 @@ msgstr "_Enviar confirmaciÃ³n"
 msgid "_Synchronize"
 msgstr "_Sincronizar"
 
-#: ../mail/message-list.c:1112
+#: ../mail/message-list.c:1159
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1113
+#: ../mail/message-list.c:1160
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1114
+#: ../mail/message-list.c:1161
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1115
+#: ../mail/message-list.c:1162
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: ../mail/message-list.c:1116
+#: ../mail/message-list.c:1163
 msgid "Multiple Unseen Messages"
 msgstr "MÃºltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1117
+#: ../mail/message-list.c:1164
 msgid "Multiple Messages"
 msgstr "MÃºltiples mensajes"
 
-#: ../mail/message-list.c:1121
+#: ../mail/message-list.c:1168
 msgid "Lowest"
 msgstr "La mÃ¡s baja"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1169
 msgid "Lower"
 msgstr "MÃ¡s baja"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1173
 msgid "Higher"
 msgstr "MÃ¡s alta"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1174
 msgid "Highest"
 msgstr "La mÃ¡s alta"
 
-#: ../mail/message-list.c:1737 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1784 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1744 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1791 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1753
+#: ../mail/message-list.c:1800
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1765
+#: ../mail/message-list.c:1812
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1773
+#: ../mail/message-list.c:1820
 msgid "%b %d %l:%M %p"
 msgstr "%e de %b %l:%M %p"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1822
 msgid "%b %d %Y"
 msgstr "%e de %b de %Y"
 
-#: ../mail/message-list.c:2527
+#: ../mail/message-list.c:2577
 msgid "Select all visible messages"
 msgstr "Selecciona todos los mensajes visibles"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4212 ../mail/message-list.c:4606
+#: ../mail/message-list.c:4337 ../mail/message-list.c:4734
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: ../mail/message-list.c:4445
+#: ../mail/message-list.c:4573
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14060,7 +14056,7 @@ msgstr ""
 "NingÃºn mensaje satisface su criterio de bÃºsqueda. Limpie el criterio de "
 "selecciÃ³n con el elemento del menÃº Buscar->Limpiar o cÃ¡mbielo."
 
-#: ../mail/message-list.c:4447
+#: ../mail/message-list.c:4575
 msgid "There are no messages in this folder."
 msgstr "No hay mensajes en esta carpeta."
 
@@ -14308,7 +14304,7 @@ msgstr "Indica si se muestra el panel de vista previa."
 
 #. 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:159
-#: ../modules/mail/em-mailer-prefs.c:1160
+#: ../modules/mail/em-mailer-prefs.c:1165
 msgid "_Table column:"
 msgstr "Columna de _tabla:"
 
@@ -14322,7 +14318,7 @@ msgstr "_Siempre mostrar la direcciÃ³n del contacto autocompletado"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:191
-#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
@@ -14570,7 +14566,7 @@ msgstr "No coincidente"
 #: ../modules/calendar/e-memo-shell-view-actions.c:760
 #: ../modules/calendar/e-task-shell-view-actions.c:960
 #: ../modules/mail/e-mail-shell-view-actions.c:1211
-#: ../shell/e-shell-content.c:441
+#: ../shell/e-shell-content.c:436
 msgid "Advanced Search"
 msgstr "BÃºsqueda avanzada"
 
@@ -14755,7 +14751,7 @@ msgstr "I_mportar a las tareas"
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:143
+#: ../modules/calendar/e-task-shell-migrate.c:145
 msgid "On The Web"
 msgstr "En la web"
 
@@ -15833,57 +15829,57 @@ msgstr "Cuenta actual"
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
-#: ../modules/mail/e-mail-shell-view-private.c:884
+#: ../modules/mail/e-mail-shell-view-private.c:881
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:895
+#: ../modules/mail/e-mail-shell-view-private.c:892
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borrado"
 msgstr[1] "%d borrados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:901
-#: ../modules/mail/e-mail-shell-view-private.c:908
+#: ../modules/mail/e-mail-shell-view-private.c:898
+#: ../modules/mail/e-mail-shell-view-private.c:905
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d SPAM"
 msgstr[1] "%d SPAM"
 
-#: ../modules/mail/e-mail-shell-view-private.c:914
+#: ../modules/mail/e-mail-shell-view-private.c:911
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../modules/mail/e-mail-shell-view-private.c:920
+#: ../modules/mail/e-mail-shell-view-private.c:917
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sin enviar"
 msgstr[1] "%d sin enviar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:926
+#: ../modules/mail/e-mail-shell-view-private.c:923
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:938
+#: ../modules/mail/e-mail-shell-view-private.c:935
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d no leÃdo, "
 msgstr[1] "%d no leÃdos, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:941
+#: ../modules/mail/e-mail-shell-view-private.c:938
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -15976,11 +15972,11 @@ msgid "No junk plugin available"
 msgstr "No existe un complemento de SPAM disponible"
 
 #. 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:1162
+#: ../modules/mail/em-mailer-prefs.c:1167
 msgid "_Date header:"
 msgstr "Cabecera de _fecha:"
 
-#: ../modules/mail/em-mailer-prefs.c:1163
+#: ../modules/mail/em-mailer-prefs.c:1168
 msgid "Show _original header value"
 msgstr "Mostrar el valor _original de la cabecera"
 
@@ -16028,7 +16024,6 @@ msgstr "De %s:"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:313
 #: ../modules/startup-wizard/evolution-startup-wizard.c:410
-#| msgid "Importing files"
 msgid "Importing Files"
 msgstr "Importando archivos"
 
@@ -16475,6 +16470,7 @@ msgstr ""
 
 #: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -16993,8 +16989,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:548
-#: ../plugins/mail-to-task/mail-to-task.c:718
-#: ../plugins/mail-to-task/mail-to-task.c:934
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
 msgid "Unknown error."
 msgstr "Error desconocido."
 
@@ -18284,16 +18280,15 @@ msgstr ""
 "Indica si se deben notificar sÃ³lo los mensajes en la carpeta bandeja de "
 "entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:346
+#: ../plugins/mail-notification/mail-notification.c:355
 msgid "Evolution's Mail Notification"
 msgstr "NotificaciÃ³n de correo de Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Mail Notification Properties"
 msgstr "Propiedades de la notificaciÃ³n de correo"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:499
+#: ../plugins/mail-notification/mail-notification.c:513
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18308,67 +18303,69 @@ msgstr[1] ""
 "Ha recibido %d mensajes nuevos\n"
 "en %s."
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:510
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:525
 #, c-format
 msgid "From: %s"
 msgstr "De: %s"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:522
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:538
 #, c-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:531
+#: ../plugins/mail-notification/mail-notification.c:548
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Ha recibido %d mensaje nuevo."
 msgstr[1] "Ha recibido %d mensajes nuevos."
 
-#: ../plugins/mail-notification/mail-notification.c:549
-#: ../plugins/mail-notification/mail-notification.c:554
+#: ../plugins/mail-notification/mail-notification.c:568
+#: ../plugins/mail-notification/mail-notification.c:575
 msgid "New email"
 msgstr "Nuevo correo-e"
 
-#: ../plugins/mail-notification/mail-notification.c:608
+#: ../plugins/mail-notification/mail-notification.c:636
 msgid "Show icon in _notification area"
 msgstr "Mostrar icono en el Ã¡rea de _notificaciÃ³n"
 
-#: ../plugins/mail-notification/mail-notification.c:636
+#: ../plugins/mail-notification/mail-notification.c:664
 msgid "B_link icon in notification area"
 msgstr "Icono pa_rpadeante en el Ã¡rea de notificaciÃ³n"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:674
 msgid "Popup _message together with the icon"
 msgstr "_Mensaje emergente junto con el icono"
 
-#: ../plugins/mail-notification/mail-notification.c:831
+#: ../plugins/mail-notification/mail-notification.c:861
 msgid "_Play sound when new messages arrive"
 msgstr "Re_producir un sonido cuando llegue correo nuevo"
 
-#: ../plugins/mail-notification/mail-notification.c:860
+#: ../plugins/mail-notification/mail-notification.c:890
 msgid "_Beep"
 msgstr "_Pitar"
 
-#: ../plugins/mail-notification/mail-notification.c:873
+#: ../plugins/mail-notification/mail-notification.c:903
 msgid "Use sound _theme"
 msgstr "Usar un _tema de sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:892
+#: ../plugins/mail-notification/mail-notification.c:922
 msgid "Play _file:"
 msgstr "_Reproducir un archivo:"
 
-#: ../plugins/mail-notification/mail-notification.c:903
+#: ../plugins/mail-notification/mail-notification.c:933
 msgid "Select sound file"
 msgstr "Seleccione un arhivo de sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:961
+#: ../plugins/mail-notification/mail-notification.c:991
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar nuevos mensajes sÃ³lo para la _bandeja de entrada"
 
-#: ../plugins/mail-notification/mail-notification.c:970
+#: ../plugins/mail-notification/mail-notification.c:1000
 msgid "Generate a _D-Bus message"
 msgstr "Generar un mensaje _D-Bus"
 
@@ -18413,7 +18410,10 @@ msgstr ""
 "La lista de notas seleccionada ya contiene la nota Â«%sÂ». Â¿Quiere editar la "
 "nota antigua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:512
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18421,7 +18421,10 @@ msgstr ""
 "El calendario seleccionado ya contiene algunos acontecimientos para los "
 "correos proporcionados. Â¿Quiere crear acontecimientos nuevos de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:521
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18429,7 +18432,10 @@ msgstr ""
 "La lista de tareas seleccionada ya contiene algunas tareas para los correos "
 "proporcionados. Â¿Quiere crear tareas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:518
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:527
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18437,7 +18443,10 @@ msgstr ""
 "La lista de notas seleccionada contiene algunas notas para los correos "
 "proporcionados. Â¿Quiere crear notas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:536
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18451,7 +18460,10 @@ msgstr[1] ""
 "El calendario seleccionada ya contiene acontecimientos para los correos "
 "proporcionados. Â¿Quiere crear los acontecimientos nuevos de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:542
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:557
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18465,7 +18477,10 @@ msgstr[1] ""
 "La lista de tareas seleccionada ya contiene notas para los correos "
 "proporcionados. Â¿Quiere crear las tareas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:548
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:566
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18479,25 +18494,25 @@ msgstr[1] ""
 "La lista de notas seleccionada ya contiene notas para los correos "
 "proporcionados. Â¿Quiere crear las notas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:607
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[Sin resumen]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:618
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "Un servidor devolviÃ³ un objeto no vÃ¡lido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:689
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "OcurriÃ³ un error al procesar: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "No se puede abrir el calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:743
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18505,7 +18520,7 @@ msgstr ""
 "El origen seleccionado es de sÃ³lo lectura, por ello no se puede crear un "
 "acontecimiento en Ã©l. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:728
+#: ../plugins/mail-to-task/mail-to-task.c:746
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18513,7 +18528,7 @@ msgstr ""
 "El origen seleccionado es de sÃ³lo lectura, por ello no se puede crear una "
 "tarea en Ã©l. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:731
+#: ../plugins/mail-to-task/mail-to-task.c:749
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18521,40 +18536,40 @@ msgstr ""
 "El origen seleccionado es de sÃ³lo lectura, por ello no se puede crear una "
 "nota en Ã©l. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:934
+#: ../plugins/mail-to-task/mail-to-task.c:952
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "No se pudo obtener la lista de origen. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1053
+#: ../plugins/mail-to-task/mail-to-task.c:1071
 msgid "Create an _Event"
 msgstr "Crear un _acontecimiento"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1055
+#: ../plugins/mail-to-task/mail-to-task.c:1073
 msgid "Create a new event from the selected message"
 msgstr "Crear un acontecimiento nuevo del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a Mem_o"
 msgstr "Crear una _nota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1080
 msgid "Create a new memo from the selected message"
 msgstr "Crear una nota nueva del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1085
 msgid "Create a _Task"
 msgstr "Crear una _tarea"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1087
 msgid "Create a new task from the selected message"
 msgstr "Crear una tarea nueva del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1095
 msgid "Create a _Meeting"
 msgstr "Crear una _reuniÃ³n"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1079
+#: ../plugins/mail-to-task/mail-to-task.c:1097
 msgid "Create a new meeting from the selected message"
 msgstr "Crear una reuniÃ³n nueva del mensaje seleccionado"
 
@@ -18720,15 +18735,15 @@ msgstr ""
 "Â¿Quiere marcar los mensajes como leÃdos sÃ³lo en la carpeta actual o en la "
 "capeta actual y todas sus subcarpetas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:188
+#: ../plugins/mark-all-read/mark-all-read.c:194
 msgid "In Current Folder and _Subfolders"
 msgstr "En la carpeta actual y _subcarpetas"
 
-#: ../plugins/mark-all-read/mark-all-read.c:202
+#: ../plugins/mark-all-read/mark-all-read.c:208
 msgid "In Current _Folder Only"
 msgstr "SÃ³lo en la ca_rpeta actual"
 
-#: ../plugins/mark-all-read/mark-all-read.c:425
+#: ../plugins/mark-all-read/mark-all-read.c:438
 msgid "Mark Me_ssages as Read"
 msgstr "Marcar los mensajes como _leÃdos"
 
@@ -19483,7 +19498,7 @@ msgstr "La barra lateral es visible"
 msgid "Skip development warning dialog"
 msgstr "Saltar el diÃ¡logo de advertencia de desarrollo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:322
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
@@ -19643,11 +19658,11 @@ msgstr "Estilo de los botones de ventana"
 msgid "Window buttons are visible"
 msgstr "Los botones de la ventana son visibles"
 
-#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
+#: ../shell/e-shell-content.c:497 ../shell/e-shell-content.c:498
 msgid "Searches"
 msgstr "BÃºsquedas"
 
-#: ../shell/e-shell-content.c:545
+#: ../shell/e-shell-content.c:540
 msgid "Save Search"
 msgstr "Guardar bÃºsqueda"
 
@@ -19710,285 +19725,269 @@ msgstr "Bug Buddy no estÃ¡ instalado."
 msgid "Bug Buddy could not be run."
 msgstr "No se pudo ejecutar Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1354
-msgid "GNOME Pilot is not installed."
-msgstr "GNOME Pilot no estÃ¡ instalado."
-
-#: ../shell/e-shell-window-actions.c:1356
-msgid "GNOME Pilot could not be run."
-msgstr "No se pudo ejecutar GNOME Pilot."
-
-#: ../shell/e-shell-window-actions.c:1450
+#: ../shell/e-shell-window-actions.c:1418
 msgid "Show information about Evolution"
 msgstr "Mostrar informaciÃ³n acerca de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1455
-#: ../shell/e-shell-window-actions.c:1469
+#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1437
 msgid "_Close Window"
 msgstr "_Cerrar ventana"
 
-#: ../shell/e-shell-window-actions.c:1476
+#: ../shell/e-shell-window-actions.c:1444
 msgid "_Contents"
 msgstr "Ã?nd_ice"
 
-#: ../shell/e-shell-window-actions.c:1478
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Open the Evolution User Guide"
 msgstr "Abrir la GuÃa de usuario de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1472
 msgid "Evolution _FAQ"
 msgstr "P+_F de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1506
+#: ../shell/e-shell-window-actions.c:1474
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Abrir la pÃ¡gina web de preguntas mÃ¡s frecuentes"
 
-#: ../shell/e-shell-window-actions.c:1511
+#: ../shell/e-shell-window-actions.c:1479
 msgid "_Forget Passwords"
 msgstr "_Olvidar contraseÃ±as"
 
-#: ../shell/e-shell-window-actions.c:1513
+#: ../shell/e-shell-window-actions.c:1481
 msgid "Forget all remembered passwords"
 msgstr "Olvidar todas las contraseÃ±as recordadas"
 
-#: ../shell/e-shell-window-actions.c:1518
+#: ../shell/e-shell-window-actions.c:1486
 msgid "I_mport..."
 msgstr "I_mportarâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1520
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Import data from other programs"
 msgstr "Importa datos de otros programas"
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1493
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ../shell/e-shell-window-actions.c:1527
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Create a new window displaying this view"
 msgstr "Crear una ventana nueva mostrando esta vista"
 
-#: ../shell/e-shell-window-actions.c:1541
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Configure Evolution"
 msgstr "Configurar Evolution"
 
-#: ../shell/e-shell-window-actions.c:1546
+#: ../shell/e-shell-window-actions.c:1514
 msgid "_Quick Reference"
 msgstr "_Referencia rÃ¡pida"
 
-#: ../shell/e-shell-window-actions.c:1548
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar los atajos de teclas de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1555
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Exit the program"
 msgstr "Sale del programa"
 
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Advanced Search..."
 msgstr "BÃºsqueda _avanzadaâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1562
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Construct a more advanced search"
 msgstr "Construir una bÃºsqueda mÃ¡s avanzada"
 
-#: ../shell/e-shell-window-actions.c:1569
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Clear the current search parameters"
 msgstr "Limpiar los parÃ¡metros de bÃºsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1574
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Edit Saved Searches..."
 msgstr "_Editar bÃºsquedas guardadasâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1576
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Manage your saved searches"
 msgstr "Gestionar sus bÃºsquedas guardadas"
 
-#: ../shell/e-shell-window-actions.c:1583
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Click here to change the search type"
 msgstr "Pulse aquÃ para cambiar el tipo de bÃºsqueda"
 
 # En conflicto con _Buscar del menu principal
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1556
 msgid "_Find Now"
 msgstr "B_uscar ahora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Execute the current search parameters"
 msgstr "Ejecutar los parÃ¡metros de bÃºsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1563
 msgid "_Save Search..."
 msgstr "_Guardar bÃºsquedaâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1597
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Save the current search parameters"
 msgstr "Guardar los parÃ¡metros de bÃºsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1609
+#: ../shell/e-shell-window-actions.c:1577
 msgid "Send / _Receive"
 msgstr "Enviar / Reci_bir"
 
-#: ../shell/e-shell-window-actions.c:1611
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Send queued items and retrieve new items"
 msgstr "EnvÃa el correo en la cola y obtiene el nuevo"
 
-#: ../shell/e-shell-window-actions.c:1616
+#: ../shell/e-shell-window-actions.c:1584
 msgid "Submit _Bug Report..."
 msgstr "Enviar informe de _falloâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1618
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Submit a bug report using Bug Buddy"
 msgstr "EnvÃa un informe de fallos usando Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1623
-msgid "GNOME Pilot _Synchronization..."
-msgstr "_sincronizaciÃ³n de GNOME Pilotâ?¦"
-
-#: ../shell/e-shell-window-actions.c:1625
-msgid "Set up GNOME Pilot configuration"
-msgstr "Configurar GNOME Pilot"
-
-#: ../shell/e-shell-window-actions.c:1630
+#: ../shell/e-shell-window-actions.c:1591
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-actions.c:1632
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Put Evolution into offline mode"
 msgstr "Poner Evolution en modo desconectado"
 
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1598
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-actions.c:1639
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Put Evolution into online mode"
 msgstr "Poner Evolution en modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1628
 msgid "Lay_out"
 msgstr "_DistribuciÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1674
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1688
+#: ../shell/e-shell-window-actions.c:1649
 msgid "_Switcher Appearance"
 msgstr "Apariencia del _selector"
 
-#: ../shell/e-shell-window-actions.c:1702
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Window"
 msgstr "_Ventana"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show Side _Bar"
 msgstr "Mostrar barra _lateral"
 
-#: ../shell/e-shell-window-actions.c:1733
+#: ../shell/e-shell-window-actions.c:1694
 msgid "Show the side bar"
 msgstr "Mostrar la barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1700
 msgid "Show _Buttons"
 msgstr "Mostrar _botones"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1702
 msgid "Show the switcher buttons"
 msgstr "Mostrar los botones del selector"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1708
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show the status bar"
 msgstr "Mostrar la barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _herramientas"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show the tool bar"
 msgstr "Mostrar la barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1740
 msgid "_Icons Only"
 msgstr "SÃ³lo _iconos"
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1742
 msgid "Display window buttons with icons only"
 msgstr "Mostrar los botones de la ventana sÃ³lo con iconos"
 
-#: ../shell/e-shell-window-actions.c:1786
+#: ../shell/e-shell-window-actions.c:1747
 msgid "_Text Only"
 msgstr "SÃ³lo _texto"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Display window buttons with text only"
 msgstr "Mostrar los botones de la ventana sÃ³lo con texto"
 
-#: ../shell/e-shell-window-actions.c:1793
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Icons _and Text"
 msgstr "Iconos _y texto"
 
-#: ../shell/e-shell-window-actions.c:1795
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Display window buttons with icons and text"
 msgstr "Mostrar los botones de la ventana con iconos y texto"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1761
 msgid "Tool_bar Style"
 msgstr "Estilo de la _barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1802
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Mostrar los botones de la ventana usando la configuraciÃ³n de la barra de "
 "herramientas del escritorio"
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Define Views..."
 msgstr "Definir vistasâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1812
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Create or edit views"
 msgstr "Crear o editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1817
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Save Custom View..."
 msgstr "Guardar vista personalizadaâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1819
+#: ../shell/e-shell-window-actions.c:1780
 msgid "Save current custom view"
 msgstr "Guardar la vista actual personalizada"
 
-#: ../shell/e-shell-window-actions.c:1826
+#: ../shell/e-shell-window-actions.c:1787
 msgid "C_urrent View"
 msgstr "Vista act_ual"
 
-#: ../shell/e-shell-window-actions.c:1836
+#: ../shell/e-shell-window-actions.c:1797
 msgid "Custom View"
 msgstr "Vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1838
+#: ../shell/e-shell-window-actions.c:1799
 msgid "Current view is a customized view"
 msgstr "La vista actual es una vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1848
+#: ../shell/e-shell-window-actions.c:1809
 msgid "Change the page settings for your current printer"
 msgstr "Cambiar la configuraciÃ³n de pÃ¡gina para la impresora actual"
 
-#: ../shell/e-shell-window-actions.c:2227
+#: ../shell/e-shell-window-actions.c:2182
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2440
+#: ../shell/e-shell-window-actions.c:2395
 msgid "Execute these search parameters"
 msgstr "Ejecutar estos parÃ¡metros de bÃºsqueda"
 
@@ -20002,20 +20001,20 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "Nuevo"
 
-#: ../shell/e-shell.c:224
+#: ../shell/e-shell.c:226
 msgid "Preparing to go offline..."
 msgstr "PreparÃ¡ndose para desconectarseâ?¦"
 
-#: ../shell/e-shell.c:274
+#: ../shell/e-shell.c:276
 msgid "Preparing to go online..."
 msgstr "PreparÃ¡ndose para conectarseâ?¦"
 
-#: ../shell/e-shell.c:342
+#: ../shell/e-shell.c:335
 msgid "Preparing to quit..."
 msgstr "PreparÃ¡ndose para salirâ?¦"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:173
+#: ../shell/main.c:175
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20051,7 +20050,7 @@ msgstr ""
 "Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
 "esperamos su contribuciÃ³n.\n"
 
-#: ../shell/main.c:197
+#: ../shell/main.c:199
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20059,55 +20058,55 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: ../shell/main.c:204
+#: ../shell/main.c:206
 msgid "Do not tell me again"
 msgstr "No preguntarme mÃ¡s veces"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:322
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:324
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar la geometrÃa proporcionada a la ventana principal"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:328
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:330
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo Â«exprÃ©sÂ»"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:333
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar el cierre de Evolution"
 
-#: ../shell/main.c:332
+#: ../shell/main.c:336
 msgid "Send the debugging output of all components to a file."
 msgstr "EnvÃa la salida de depuraciÃ³n de todos los componentes a un archivo."
 
-#: ../shell/main.c:334
+#: ../shell/main.c:338
 msgid "Disable loading of any plugins."
 msgstr "Desactivar la carga de cualquier complemento."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:340
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar la vista previa del correo, contactos y tareas."
 
-#: ../shell/main.c:340
+#: ../shell/main.c:344
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importar URI o nombres de archivos proporcionados como argumentos."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:346
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar que el proceso de ejecuciÃ³n de Evolution finalice"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:469
 msgid "- The Evolution PIM and Email Client"
 msgstr "El cliente de correo-e y GIP Evolution"
 
-#: ../shell/main.c:516
+#: ../shell/main.c:531
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20282,55 +20281,69 @@ msgstr ""
 "este certificado, entonces usted no confÃa en la autenticidad de este "
 "certificado a no ser que se indique otra cosa aquÃ"
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
 msgstr "Seleccione un certificado para importarâ?¦"
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "Todos los archivos PKCS12"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+#| msgid "Imported Certificate"
+msgid "Failed to import user's certificate"
+msgstr "FallÃ³ al importar el certificado del usuario"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
 msgstr "Nombre del certificado"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "PropÃ³sito"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "NÃºmero de serie"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "Caduca"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "Todos los archivos de certificado de correos-e"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+#| msgid "Failed to delete contact"
+msgid "Failed to import contact's certificate"
+msgstr "FallÃ³ al importar el certificado del contacto"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "DirecciÃ³n de correo-e"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "Todos los archivos de certificados AC"
 
-#: ../smime/gui/certificate-manager.c:1052
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr "FallÃ³ al importar el certificado de la autoridad de certificados"
+
+#: ../smime/gui/certificate-manager.c:1148
 msgid "Certificates"
 msgstr "Certificados"
 
@@ -20543,8 +20556,7 @@ msgstr "_Respaldo"
 msgid "_Edit CA Trust"
 msgstr "_Editar confianza en la AC"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:734
+#: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
 msgstr "El certificado ya existe"
 
@@ -20982,28 +20994,28 @@ msgstr[1] "Guardar los adjuntos"
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:299
+#: ../widgets/misc/e-attachment-view.c:301
 msgid "S_ave All"
 msgstr "Guardar _todo"
 
-#: ../widgets/misc/e-attachment-view.c:325
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "A_dd Attachment..."
 msgstr "_AÃ±adir adjuntoâ?¦"
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../widgets/misc/e-attachment-view.c:356
+#: ../widgets/misc/e-attachment-view.c:358
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../widgets/misc/e-attachment-view.c:638
+#: ../widgets/misc/e-attachment-view.c:640
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Abrir con Â«%sÂ»"
 
-#: ../widgets/misc/e-attachment-view.c:641
+#: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Abrir este adjunto en %s"
@@ -21151,7 +21163,7 @@ msgid "File _type:"
 msgstr "_Tipo de archivo:"
 
 #: ../widgets/misc/e-import-assistant.c:326
-#: ../widgets/misc/e-import-assistant.c:879
+#: ../widgets/misc/e-import-assistant.c:909
 msgid "Choose the destination for this import"
 msgstr "Elija el destino de esta importaciÃ³n"
 
@@ -21178,33 +21190,39 @@ msgstr ""
 "configuraciÃ³n que se pueda importar. Si quiere intentarlo de nuevo, pulse el "
 "botÃ³n Â«AtrÃ¡sÂ»."
 
-#: ../widgets/misc/e-import-assistant.c:878
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:766
+#| msgid "_Import"
+msgid "_Cancel Import"
+msgstr "_Cancelar la importaciÃ³n"
+
+#: ../widgets/misc/e-import-assistant.c:908
 msgid "Preview data to be imported"
 msgstr "Vista previa de los datos para importar"
 
-#: ../widgets/misc/e-import-assistant.c:884
-#: ../widgets/misc/e-import-assistant.c:897
-#: ../widgets/misc/e-import-assistant.c:1274
-#: ../widgets/misc/e-import-assistant.c:1347
-#: ../widgets/misc/e-import-assistant.c:1357
+#: ../widgets/misc/e-import-assistant.c:914
+#: ../widgets/misc/e-import-assistant.c:927
+#: ../widgets/misc/e-import-assistant.c:1285
+#: ../widgets/misc/e-import-assistant.c:1358
+#: ../widgets/misc/e-import-assistant.c:1368
 msgid "Import Data"
 msgstr "Importar datos"
 
-#: ../widgets/misc/e-import-assistant.c:892
+#: ../widgets/misc/e-import-assistant.c:922
 msgid "Select what type of file you want to import from the list."
 msgstr "Seleccionar quÃ© tipo de archivo quiere importar de la lista"
 
-#: ../widgets/misc/e-import-assistant.c:1265
-#: ../widgets/misc/e-import-assistant.c:1300
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Evolution Import Assistant"
 msgstr "Asistente de importaciÃ³n de Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1282
-#: ../widgets/misc/e-import-assistant.c:1334
+#: ../widgets/misc/e-import-assistant.c:1293
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Import Location"
 msgstr "Lugar de importaciÃ³n"
 
-#: ../widgets/misc/e-import-assistant.c:1293
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21214,19 +21232,19 @@ msgstr ""
 "Este asistente le guiarÃ¡ a travÃ©s del proceso de importaciÃ³n de archivos "
 "externos dentro de Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1309
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Importer Type"
 msgstr "Tipo de importador"
 
-#: ../widgets/misc/e-import-assistant.c:1318
+#: ../widgets/misc/e-import-assistant.c:1329
 msgid "Select Information to Import"
 msgstr "Seleccione la imformaciÃ³n para importar"
 
-#: ../widgets/misc/e-import-assistant.c:1326
+#: ../widgets/misc/e-import-assistant.c:1337
 msgid "Select a File"
 msgstr "Seleccione un archivo"
 
-#: ../widgets/misc/e-import-assistant.c:1341
+#: ../widgets/misc/e-import-assistant.c:1352
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Pulse Â«AplicarÂ» para comenzar a importar el archivo en Evolution."
 
@@ -21260,18 +21278,6 @@ msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Actualmente Evolution estÃ¡ desconectado porque la red no estÃ¡ disponible."
 
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "Sincronizar con:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "Sincr. registros privados:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "Sincr. categorÃas:"
-
 #: ../widgets/misc/e-preferences-window.c:266
 msgid "Evolution Preferences"
 msgstr "Preferencias de Evolution"
@@ -21605,7 +21611,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos _disponibles:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1697
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -21618,7 +21624,7 @@ msgid "Clear _All"
 msgstr "Quitar _todo"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1697
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "Descendente"
 
@@ -21717,60 +21723,60 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
 msgstr "Personalizar vista actual"
 
-#: ../widgets/table/e-table-header-item.c:1562
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "Ordenar _ascendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1565
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "Ordenar _descendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1568
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "_Desordenar"
 
-#: ../widgets/table/e-table-header-item.c:1571
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "Agrupar por _este campo"
 
-#: ../widgets/table/e-table-header-item.c:1574
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "Agrupar por _caja"
 
-#: ../widgets/table/e-table-header-item.c:1578
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "Quitar esta c_olumna"
 
-#: ../widgets/table/e-table-header-item.c:1581
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
 msgstr "AÃ±adir una c_olumnaâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1585
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "A_lineaciÃ³n"
 
-#: ../widgets/table/e-table-header-item.c:1588
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "Ajust_e automÃ¡tico"
 
-#: ../widgets/table/e-table-header-item.c:1591
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "Formatear columna_sâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1595
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar vista actualâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1654
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "_Ordenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1672
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "_Personalizado"
 
@@ -21819,6 +21825,62 @@ msgstr "Seleccionar todo"
 msgid "Input Methods"
 msgstr "MÃ©todos de entrada"
 
+#~ msgid "Default Sync Address:"
+#~ msgstr "DirecciÃ³n de sincr. predeterminada:"
+
+#~ msgid "Could not load address book"
+#~ msgstr "No se pudo cargar la libreta de direcciones"
+
+#~ msgid "Could not read pilot's Address application block"
+#~ msgstr ""
+#~ "No es posible leer el bloque de la aplicaciÃ³n de Direcciones del Pilot"
+
+#~ msgid "Split Multi-Day Events:"
+#~ msgstr "Dividir acontecimientos de dÃas mÃºltiples:"
+
+#~ msgid "Could not start evolution-data-server"
+#~ msgstr "No se ha podido iniciar el servidor evolution-data-server"
+
+#~ msgid "Could not read pilot's Calendar application block"
+#~ msgstr ""
+#~ "No es posible leer informaciÃ³n de la aplicaciÃ³n de calendario del Pilot"
+
+#~ msgid "Could not read pilot's Memo application block"
+#~ msgstr "No es posible leer los datos de la aplicaciÃ³n Memo del Pilot"
+
+#~ msgid "Could not write pilot's Memo application block"
+#~ msgstr "No es posible escribir los datos de la aplicaciÃ³n Memo del Pilot"
+
+#~ msgid "Default Priority:"
+#~ msgstr "Prioridad predeterminada:"
+
+#~ msgid "Could not read pilot's ToDo application block"
+#~ msgstr "No es posible leer los datos de la aplicaciÃ³n ToDo del Pilot"
+
+#~ msgid "Could not write pilot's ToDo application block"
+#~ msgstr "No es posible escribir el bloque de aplicaciÃ³n ToDo del Pilot"
+
+#~ msgid "GNOME Pilot is not installed."
+#~ msgstr "GNOME Pilot no estÃ¡ instalado."
+
+#~ msgid "GNOME Pilot could not be run."
+#~ msgstr "No se pudo ejecutar GNOME Pilot."
+
+#~ msgid "GNOME Pilot _Synchronization..."
+#~ msgstr "_sincronizaciÃ³n de GNOME Pilotâ?¦"
+
+#~ msgid "Set up GNOME Pilot configuration"
+#~ msgstr "Configurar GNOME Pilot"
+
+#~ msgid "Sync with:"
+#~ msgstr "Sincronizar con:"
+
+#~ msgid "Sync Private Records:"
+#~ msgstr "Sincr. registros privados:"
+
+#~ msgid "Sync Categories:"
+#~ msgstr "Sincr. categorÃas:"
+
 #~ msgid "Guides you through your initial account setup."
 #~ msgstr "Le guÃa a travÃ©s de su configuraciÃ³n inicial de cuenta."
 
@@ -24954,9 +25016,6 @@ msgstr "MÃ©todos de entrada"
 #~ msgid "Click OK to close these connections and go offline"
 #~ msgstr "Pulse Â«AceptarÂ» para cerrar estas conexiones y desconectarse"
 
-#~ msgid "_Import"
-#~ msgstr "_Importar"
-
 #~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
 #~ msgstr ""
 #~ "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]