Updated Spanish translation

1 files changed, 2309 insertions, 2106 deletions

diff --git a/po/es.po b/po/es.po
index dffe47724b..42c30cc830 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:534
+#: ../shell/main.c:565
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution\n"
-"POT-Creation-Date: 2010-09-11 04:32+0000\n"
-"PO-Revision-Date: 2010-09-11 12:18+0200\n"
+"POT-Creation-Date: 2010-10-08 12:54+0000\n"
+"PO-Revision-Date: 2010-10-10 14:41+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"
@@ -96,7 +96,7 @@ msgid "Delete address book '{0}'?"
 msgstr "¿Quiere eliminar la libreta de direcciones «{0}»?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
 msgid "Do _Not Delete"
 msgstr "_No eliminar"
 
@@ -110,7 +110,7 @@ msgstr "No es posible autenticar con el servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "Falló al eliminar el contacto"
 
@@ -230,7 +230,7 @@ msgstr ""
 
 #: ../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
+#: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Añadir"
@@ -253,7 +253,7 @@ msgstr "_Usar tal cual es"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2020
+#: ../calendar/gui/e-calendar-view.c:2027
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -264,8 +264,8 @@ msgstr "Aniversario"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2019 ../capplet/anjal-settings-main.c:117
-#: ../shell/main.c:122
+#: ../calendar/gui/e-calendar-view.c:2026 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:128
 msgid "Birthday"
 msgstr "Cumpleaños"
 
@@ -302,7 +302,7 @@ msgstr "Editor de contactos"
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
+#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "Correo-e"
 
@@ -361,7 +361,7 @@ msgstr "Notas"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-calendar-view.c:1732
 msgid "Other"
 msgstr "Otro"
 
@@ -413,9 +413,9 @@ msgid "_Blog:"
 msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:885
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1921
+#: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
@@ -534,7 +534,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "Error adding contact"
 msgstr "Error al añadir el contacto"
 
@@ -674,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:657
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
@@ -691,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:173
+#: ../mail/mail-config.ui.h:154
 msgid "_Select..."
 msgstr "_Seleccionar…"
 
@@ -700,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:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Members"
 msgstr "Miembros de la lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
 msgid "_Members"
 msgstr "_Miembros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
 msgid "Error adding list"
 msgstr "Error al añadir la lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
 msgid "Error modifying list"
 msgstr "Error al modificar la lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
 msgid "Error removing list"
 msgstr "Error al eliminar la lista"
 
@@ -837,33 +837,33 @@ msgstr "Eliminar los contactos seleccionados"
 msgid "Select all visible contacts"
 msgstr "Seleccionar todos los contactos visibles"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1296
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "¿Seguro que quiere eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete this contact list?"
 msgstr "¿Seguro que quiere eliminar esta lista de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "¿Seguro que quiere eliminar esta lista de contactos (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
 msgid "Are you sure you want to delete these contacts?"
 msgstr "¿Seguro que quiere eliminar estos contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 msgid "Are you sure you want to delete this contact?"
 msgstr "¿Seguro que quiere eliminar este contacto?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "¿Seguro que quiere eliminar este contacto (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -872,11 +872,11 @@ msgstr ""
 "Abrir %d contactos abrirá también %d ventanas nuevas.\n"
 "¿Quiere realmente mostrar todos estos contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "_Don't Display"
 msgstr "_No mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1479
 msgid "Display _All Contacts"
 msgstr "Mostrar t_odos los contactos"
 
@@ -1047,7 +1047,7 @@ msgstr "Unidad"
 msgid "Web Site"
 msgstr "Sitio web"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1057,7 +1057,7 @@ msgstr ""
 "\n"
 "Buscando contactos…"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1071,7 +1071,7 @@ msgstr ""
 "\n"
 "o pulse dos veces aquí para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1085,7 +1085,7 @@ msgstr ""
 "\n"
 "Pulse dos veces aquí para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1095,7 +1095,7 @@ msgstr ""
 "\n"
 "Buscar contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1105,16 +1105,16 @@ msgstr ""
 "\n"
 "No hay elementos para mostrar en esta vista."
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Work Email"
 msgstr "Correo-e de trabajo"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:103
 msgid "Home Email"
 msgstr "Correo-e de casa"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:810
 msgid "Other Email"
 msgstr "Otro correo-e"
 
@@ -1209,7 +1209,7 @@ msgstr "Charla por vídeo"
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:497
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
@@ -1253,7 +1253,7 @@ msgstr "Diario web"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../capplet/settings/mail-capplet-shell.c:353
 #: ../modules/addressbook/e-book-shell-backend.c:116
 #: ../modules/addressbook/e-book-shell-migrate.c:138
 #: ../modules/calendar/e-cal-shell-backend.c:127
@@ -1295,7 +1295,7 @@ msgstr ""
 "uso desconectado. Cargue la libreta de direcciones una vez que esté en modo "
 "conectado para descargar su contenido"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1304,7 +1304,7 @@ msgstr ""
 "No se puede abrir esta libreta de direcciones. Compruebe que la ruta %s "
 "existe y que tiene permisos para acceder a ella."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:92
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1313,7 +1313,7 @@ msgstr ""
 "LDAP en Evolution debe tener instalado un paquete Evolution con LDAP "
 "activado."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1321,11 +1321,11 @@ msgstr ""
 "No se puede abrir esta libreta de direcciones. Esto significa que ha "
 "introducido un URI erróneo o que el servidor LDAP es inaccesible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "Detalle del mensaje de error:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1338,7 +1338,7 @@ msgstr ""
 "el límite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1351,51 +1351,51 @@ msgstr ""
 "opciones del servidor de directorios para esta libreta de direcciones."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
 "El backend de esta libreta de direcciones no pudo analizar esta consulta. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
 "El backend para esta libreta de direcciones rehusó efectuar esta consulta. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Esta consulta no se completó con éxito. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "Seleccione la libreta de direcciones"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:286
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:444
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:449
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:451
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
@@ -1404,7 +1404,7 @@ msgid "Card View"
 msgstr "Vista de la tarjeta"
 
 #: ../addressbook/importers/evolution-csv-importer.c:720
-#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-ldif-importer.c:518
 #: ../addressbook/importers/evolution-vcard-importer.c:264
 #: ../calendar/importers/icalendar-importer.c:325
 #: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
@@ -1435,11 +1435,11 @@ msgstr "VSC o Tab de Evolution (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador de VSC y Tab de Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:742
+#: ../addressbook/importers/evolution-ldif-importer.c:744
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:743
+#: ../addressbook/importers/evolution-ldif-importer.c:745
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF de Evolution"
 
@@ -1472,31 +1472,31 @@ msgstr "No se pudo obtener una lista de libretas de direcciones"
 msgid "failed to open book"
 msgstr "falló al abrir libreta de direcciones"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "Especifique el archivo de salida en lugar del la salida estándar"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "ARCHIVO-DE-SALIDA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "Listar las carpetas de libretas de direcciones locales"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "Mostrar tarjetas como un archivo vcard o csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 msgid "Export in asynchronous mode"
 msgstr "Exportar en modo asíncrono"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -1504,30 +1504,30 @@ msgstr ""
 "El número de tarjetas en un archivo de salida en modo asíncrono, tamaño "
 "predeterminado 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "NÚMERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Error en los argumentos de la línea de comandos, use la opción --help para "
 "ver el uso."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 msgid "Only support csv or vcard format."
 msgstr "Sólo se soportan los los formatos csv o vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "En modo asíncrono, la salida debe ser un archivo."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "En modo normal, no hay necesidad de la opción de tamaño."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
 msgstr "Error no tratado"
 
@@ -1955,7 +1955,7 @@ msgid "_Save Changes"
 msgstr "_Guardar cambios"
 
 #: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:146
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
@@ -1964,19 +1964,19 @@ msgstr "_Enviar"
 msgid "_Send Notice"
 msgstr "_Enviar notificación"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "Hora de inicio"
 
@@ -1993,8 +1993,8 @@ msgstr "Descartar _todo"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1604
-#: ../calendar/gui/e-itip-control.c:1175
-#: ../plugins/itip-formatter/itip-view.c:1043
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "Lugar:"
 
@@ -2127,7 +2127,7 @@ msgid "Alarm programs"
 msgstr "Programas de alerta"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Tiempo en segundos que deberá mostrarse el error en la barra de estado."
@@ -2270,7 +2270,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:95
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel más allá del cuál el mensaje se debe registrar."
 
@@ -2799,7 +2799,7 @@ msgid "Classification"
 msgstr "Clasificación"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
+#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -2808,7 +2808,7 @@ msgstr "Confidencial"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
@@ -2843,13 +2843,13 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/e-cal-model.c:532 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-cal-model.c:530
 #: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Público"
@@ -2924,7 +2924,7 @@ msgid "Add Alarm"
 msgstr "Añadir alerta"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:362
 msgid "Alarm"
 msgstr "Alerta"
 
@@ -2940,7 +2940,7 @@ msgstr "Sonido de alerta personalizado"
 msgid "Mes_sage:"
 msgstr "_Mensaje:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:70
 msgid "Options"
 msgstr "Opciones"
 
@@ -3086,12 +3086,12 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10
 msgid "Alerts"
 msgstr "Alertas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:28
 #: ../modules/addressbook/autocompletion-config.c:156
 msgid "Date/Time Format"
 msgstr "Formato de la fecha y hora"
@@ -3118,7 +3118,7 @@ msgstr "Mostrar alarmas sólo en el área de _notificación"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Friday"
 msgstr "viernes"
 
@@ -3126,9 +3126,9 @@ 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:56
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:49
 #: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2678
+#: ../plugins/itip-formatter/itip-formatter.c:2787
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -3144,12 +3144,12 @@ msgstr "Minutos"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Monday"
 msgstr "lunes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:74
 msgid "Pick a color"
 msgstr "Elija un color"
 
@@ -3160,7 +3160,7 @@ msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 #: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Saturday"
 msgstr "sábado"
 
@@ -3192,7 +3192,7 @@ msgstr "Mostrar _números de semanas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Sunday"
 msgstr "domingo"
 
@@ -3216,13 +3216,13 @@ msgstr "Plantilla:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Thursday"
 msgstr "jueves"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:595
+#: ../widgets/misc/e-dateedit.c:598
 msgid "Time"
 msgstr "Hora"
 
@@ -3237,7 +3237,7 @@ msgstr "Formato de la hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Tuesday"
 msgstr "martes"
 
@@ -3247,7 +3247,7 @@ msgstr "Usar la zona horaria del s_istema"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Wednesday"
 msgstr "miércoles"
 
@@ -3346,9 +3346,9 @@ msgstr "Tipo:"
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:286
 msgid "_Name:"
@@ -3454,239 +3454,239 @@ msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
 msgid "Validation error: %s"
 msgstr "Error de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:252
 msgid "Could not save attachments"
 msgstr "No se pudieron guardar los adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:522
+#: ../calendar/gui/dialogs/comp-editor.c:528
 msgid "Could not update object"
 msgstr "No es posible actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:643
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:644
+#: ../calendar/gui/dialogs/comp-editor.c:650
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:646
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:658
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarea asignada: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:654
+#: ../calendar/gui/dialogs/comp-editor.c:660
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:665
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:681
 msgid "No Summary"
 msgstr "Sin resumen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:792
 msgid "Keep original item?"
 msgstr "¿Mantener el elemento original?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
+#: ../calendar/gui/dialogs/comp-editor.c:988
 msgid "Click here to close the current window"
 msgstr "Pulse aquí para cerrar la ventana actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
+#: ../calendar/gui/dialogs/comp-editor.c:995 ../mail/e-mail-browser.c:120
 #: ../shell/e-shell-window-actions.c:1454
 #: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
 #: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
 msgid "Copy the selection"
 msgstr "Copiar la selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
+#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:127
 #: ../shell/e-shell-window-actions.c:1461
 #: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
 #: ../widgets/misc/e-web-view.c:1060
 msgid "Cut the selection"
 msgstr "Cortar la selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../calendar/gui/dialogs/comp-editor.c:1009
 #: ../shell/e-shell-window-actions.c:1468
 #: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "Eliminar la selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011
+#: ../calendar/gui/dialogs/comp-editor.c:1016
 msgid "Click here to view help available"
 msgstr "Pulse aquí para ver la ayuda disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
+#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:134
 #: ../shell/e-shell-window-actions.c:1503
 #: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
 #: ../widgets/misc/e-web-view.c:1072
 msgid "Paste the clipboard"
 msgstr "Pega el contenido del porta papeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../calendar/gui/dialogs/comp-editor.c:1044
 msgid "Click here to save the current window"
 msgstr "Pulse aquí para guardar la vista actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
+#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:141
 #: ../shell/e-shell-window-actions.c:1573
 #: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
+#: ../calendar/gui/dialogs/comp-editor.c:1058
 msgid "_Classification"
 msgstr "_Clasificación"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1065
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:155
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1608
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
+#: ../calendar/gui/dialogs/comp-editor.c:1072 ../mail/e-mail-browser.c:148
 #: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:220
+#: ../widgets/misc/e-signature-editor.c:222
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1079
 #: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 #: ../composer/e-composer-actions.c:315
 msgid "_Options"
 msgstr "_Opciones"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
+#: ../calendar/gui/dialogs/comp-editor.c:1100 ../mail/e-mail-browser.c:162
 #: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 #: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "_Adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Click here to attach a file"
 msgstr "Pulse aquí para adjuntar un archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 msgid "_Categories"
 msgstr "_Categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1122
 msgid "Toggles whether to display categories"
 msgstr "Conmuta cuando se muestran las categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Time _Zone"
 msgstr "_Zona horaria"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1130
 msgid "Toggles whether the time zone is displayed"
 msgstr "Conmuta cuando se muestra la «Zona horaria»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "Classify as public"
 msgstr "Clasificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "R_ole Field"
 msgstr "Campo «_Rol»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Toggles whether the Role field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Rol»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_RSVP"
 msgstr "_Confirmar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1173
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Confirmar»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1179
 msgid "_Status Field"
 msgstr "Campo de _estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1181
 msgid "Toggles whether the Status field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Estado»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1187
 msgid "_Type Field"
 msgstr "Campo de _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1189
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../calendar/gui/dialogs/comp-editor.c:1748
 #: ../composer/e-composer-actions.c:431
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2072
-#: ../calendar/gui/dialogs/comp-editor.c:2121
-#: ../calendar/gui/dialogs/comp-editor.c:3086
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:3092
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3056
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3118
+#: ../calendar/gui/dialogs/comp-editor.c:3124
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versión actual."
 
@@ -3812,7 +3812,7 @@ msgstr "Convertir en acontecimiento repetitivo"
 
 #: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:210
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "Opciones de envío"
@@ -3838,97 +3838,97 @@ msgstr "_Disponibilidad"
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar información de disponibilidad para los participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2610
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2674
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-editor.c:386
 #: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
+#: ../calendar/gui/dialogs/event-editor.c:579
 msgid "Print this event"
 msgstr "Imprime este acontecimiento"
 
-#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:769
 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:807
+#: ../calendar/gui/dialogs/event-page.c:810
 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:811
+#: ../calendar/gui/dialogs/event-page.c:814
 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:823
-#: ../calendar/gui/dialogs/event-page.c:2775
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2778
 msgid "This event has alarms"
 msgstr "Este acontecimiento tiene alertas."
 
-#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:893
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:937
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:942
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no start date"
 msgstr "Acontecimiento sin fecha de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1160
 msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/event-page.c:1331
 #: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/task-page.c:910
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1341
 msgid "End date is wrong"
 msgstr "La fecha de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1364
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1371
 msgid "End time is wrong"
 msgstr "La hora de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/event-page.c:1533
 #: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:967
+#: ../calendar/gui/dialogs/task-page.c:970
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/event-page.c:1539
 #: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/task-page.c:976
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1561
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1564
+#: ../calendar/gui/dialogs/task-page.c:1000
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:2649
+#: ../calendar/gui/dialogs/event-page.c:2652
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No es posible abrir el calendario «%s»."
@@ -3939,47 +3939,47 @@ 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:2693
+#: ../calendar/gui/dialogs/event-page.c:2696
 #: ../calendar/gui/dialogs/memo-page.c:946
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/task-page.c:1790
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está actuando en nombre de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2994
+#: ../calendar/gui/dialogs/event-page.c:2997
 #, 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:3000
+#: ../calendar/gui/dialogs/event-page.c:3003
 #, 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:3006
+#: ../calendar/gui/dialogs/event-page.c:3009
 #, 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:3019
+#: ../calendar/gui/dialogs/event-page.c:3022
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3024
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ninguna"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:575
 msgid "Atte_ndees..."
 msgstr "_Participantes…"
 
@@ -4045,7 +4045,7 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "hasta"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2614
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2678
 msgid "Memo"
 msgstr "Nota"
 
@@ -4070,9 +4070,9 @@ msgstr "La nota no se puede editar completamente porque no es el organizador"
 msgid "Unable to open memos in '%s'."
 msgstr "No es posible abrir las notas en «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
-#: ../em-format/em-format.c:1040 ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:282
+#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2390
+#: ../mail/em-format-html.c:2449 ../mail/em-format-html.c:2473
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Para"
@@ -4092,7 +4092,7 @@ msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.c:429
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
@@ -4234,7 +4234,7 @@ msgid "21st to 31st"
 msgstr "del 21 al 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
@@ -4279,7 +4279,7 @@ msgstr "Cada"
 msgid "Exceptions"
 msgstr "Excepciones"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:77
 msgid "Preview"
 msgstr "Vista previa"
 
@@ -4352,8 +4352,8 @@ msgstr "Página web"
 #: ../calendar/gui/e-cal-model-tasks.c:443
 #: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
-#: ../calendar/gui/print.c:2697 ../mail/em-sync-stream.c:151
-#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#: ../calendar/gui/print.c:2761 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "Cancelado"
@@ -4363,10 +4363,10 @@ msgstr "Cancelado"
 #: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:441
 #: ../calendar/gui/e-cal-model-tasks.c:715
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-itip-control.c:932 ../calendar/gui/e-meeting-store.c:197
 #: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2694 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/print.c:2758 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Terminado"
@@ -4375,7 +4375,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:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:13
+#: ../mail/message-list.c:1188 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Alta"
 
@@ -4386,7 +4386,7 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:713
 #: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
 #: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2755
 msgid "In Progress"
 msgstr "En proceso"
 
@@ -4394,15 +4394,15 @@ 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:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:14
+#: ../mail/message-list.c:1186 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Baja"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
+#: ../calendar/gui/e-cal-model.c:1278 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1187
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
@@ -4413,7 +4413,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
 #: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2688 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:2752 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Sin comenzar"
 
@@ -4429,7 +4429,7 @@ msgstr "_Estado:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-calendar-view.c:1780
 #: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4470,7 +4470,7 @@ msgstr "Pulse para cambiar o ver los detalles del estado de la tarea"
 msgid "_Send Options"
 msgstr "Opciones de _envío"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2612
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2676
 #: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "Tarea"
@@ -4483,32 +4483,32 @@ msgstr "Detalles"
 msgid "Print this task"
 msgstr "Imprimir esta tarea"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:346
 msgid "Task's start date is in the past"
 msgstr "La hora de inicio de la tarea está en el pasado"
 
-#: ../calendar/gui/dialogs/task-page.c:344
+#: ../calendar/gui/dialogs/task-page.c:347
 msgid "Task's due date is in the past"
 msgstr "La fecha de vencimiento de la tarea está en el pasado"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:382
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "La tarea no se puede editar porque es de sólo lectura"
 
-#: ../calendar/gui/dialogs/task-page.c:383
+#: ../calendar/gui/dialogs/task-page.c:386
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "La tarea no se puede editar completamente porque no es el organizador"
 
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:437
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:883
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1747
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en «%s»."
@@ -4610,7 +4610,7 @@ msgid "Categories:"
 msgstr "Categorías:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1165 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4625,8 +4625,8 @@ msgstr "Fecha de vencimiento:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1189
-#: ../plugins/itip-formatter/itip-view.c:1074
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "Estado:"
 
@@ -4635,8 +4635,8 @@ msgid "Priority:"
 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:37
+#: ../calendar/gui/e-itip-control.c:1228 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "Descripción:"
 
@@ -4672,7 +4672,7 @@ msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:558 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "Ocupada"
 
@@ -4692,42 +4692,41 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1284
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
 msgid "Yes"
 msgstr "Sí"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1284
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "No"
 
-#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-itip-control.c:1211
+#: ../calendar/gui/e-itip-control.c:1350
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2345
-#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:1013
+#: ../calendar/gui/print.c:1030 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:98
+#: ../plugins/itip-formatter/itip-formatter.c:458
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1280
 msgid "Recurring"
 msgstr "Repetición"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1282
 msgid "Assigned"
 msgstr "Asignado"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2184
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
@@ -4771,69 +4770,69 @@ msgstr "Fecha de inicio"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:414
 msgid "Cut selected events to the clipboard"
 msgstr "Cortar los acontecimientos seleccionados al portapapeles"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar los acontecimientos seleccionados al portapapeles"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Paste events from the clipboard"
 msgstr "Pega los acontecimientos desde el portapapeles"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Delete selected events"
 msgstr "Borra los acontecimientos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-calendar-view.c:451 ../calendar/gui/e-memo-table.c:188
 #: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-calendar-view.c:645 ../calendar/gui/e-memo-table.c:847
 #: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-calendar-view.c:1727
+#: ../calendar/gui/e-itip-control.c:1196
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2333
+#: ../plugins/itip-formatter/itip-formatter.c:2442
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-calendar-view.c:1721
-#: ../calendar/gui/e-itip-control.c:1205
+#: ../calendar/gui/e-calendar-view.c:1728
+#: ../calendar/gui/e-itip-control.c:1206
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2339
+#: ../plugins/itip-formatter/itip-formatter.c:2448
 msgid "Declined"
 msgstr "Rehusado"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1729
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:557
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1730
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2342
+#: ../plugins/itip-formatter/itip-formatter.c:2451
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1731
 msgid "Needs action"
 msgstr "Necesita una acción"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1868 ../calendar/gui/e-memo-table.c:530
+#: ../calendar/gui/e-calendar-view.c:1875 ../calendar/gui/e-memo-table.c:530
 #: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4841,20 +4840,20 @@ msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-calendar-view.c:1879 ../calendar/gui/e-memo-table.c:535
 #: ../calendar/gui/e-task-table.c:748
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1888 ../calendar/gui/print.c:2646
+#: ../calendar/gui/e-calendar-view.c:1895 ../calendar/gui/print.c:2710
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1919
+#: ../calendar/gui/e-calendar-view.c:1926
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -4897,8 +4896,8 @@ msgstr "Muestra la segunda zona horaria"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1893
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1785
 msgid "%A %d %B"
 msgstr "%A %e de %B"
 
@@ -4908,10 +4907,10 @@ msgstr "%A %e de %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1910
 #: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#: ../calendar/gui/ea-gnome-calendar.c:203
+#: ../modules/calendar/e-cal-shell-view-private.c:1015
 msgid "%a %d %b"
 msgstr "%a, %e de %b"
 
@@ -4920,54 +4919,54 @@ msgstr "%a, %e de %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1926
 #: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../calendar/gui/ea-gnome-calendar.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1051
 msgid "%d %b"
 msgstr "%e de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1089 ../calendar/gui/e-week-view.c:767
+#: ../calendar/gui/print.c:860
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1092 ../calendar/gui/e-week-view.c:770
+#: ../calendar/gui/print.c:862
 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:2646
+#: ../calendar/gui/e-day-view.c:2677
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
 
-#: ../calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:762
 msgid "Recurring:"
 msgstr "Repetición:"
 
-#: ../calendar/gui/e-itip-control.c:765
+#: ../calendar/gui/e-itip-control.c:766
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetición compuesta)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:783
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada día"
 msgstr[1] "Cada %d días"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Cada semana"
 msgstr[1] "Cada %d semanas"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:803
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -4975,35 +4974,35 @@ msgstr[0] "Cada semana en "
 msgstr[1] "Cada %d semanas el "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:814
 msgid " and "
 msgstr " y "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:823
 #, c-format
 msgid "The %s day of "
 msgstr "El %s día de "
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:839
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de "
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:850
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "cada mes"
 msgstr[1] "cada %d meses"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:862
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada año"
 msgstr[1] "Cada %d años"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:875
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -5011,36 +5010,36 @@ msgstr[0] "un total de %d vez"
 msgstr[1] "un total de %d veces"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:886
 msgid ", ending on "
 msgstr ", terminando en "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:906
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Empieza"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:916
+#: ../calendar/gui/e-itip-control.c:917
 msgid "Ends"
 msgstr "Termina"
 
-#: ../calendar/gui/e-itip-control.c:943
+#: ../calendar/gui/e-itip-control.c:944
 #: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "Vence"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
+#: ../calendar/gui/e-itip-control.c:987 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "Información de iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:1009
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1093 ../calendar/gui/e-itip-control.c:1109
+#: ../calendar/gui/e-itip-control.c:1120 ../calendar/gui/e-itip-control.c:1137
 #: ../plugins/itip-formatter/itip-view.c:362
 #: ../plugins/itip-formatter/itip-view.c:363
 #: ../plugins/itip-formatter/itip-view.c:450
@@ -5049,7 +5048,7 @@ msgstr "Error de iCalendar"
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-itip-control.c:1146
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
@@ -5057,18 +5056,18 @@ msgstr ""
 "Revise la siguiente información y seleccione una acción del menú de abajo."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2320
+#: ../calendar/gui/e-itip-control.c:1161
+#: ../plugins/itip-formatter/itip-formatter.c:2429
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2336
+#: ../calendar/gui/e-itip-control.c:1201
+#: ../plugins/itip-formatter/itip-formatter.c:2445
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-itip-control.c:1291
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -5076,275 +5075,275 @@ msgstr ""
 "La reunión ha sido cancelada, sin embargo no pudo encontrarse en sus "
 "calendarios"
 
-#: ../calendar/gui/e-itip-control.c:1292
+#: ../calendar/gui/e-itip-control.c:1293
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "La tarea ha sido cancelada, sin embargo no pudo encontrarse en sus listas de "
 "tareas"
 
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "%s has published meeting information."
 msgstr "%s ha publicado información de reunión."
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1371
 msgid "Meeting Information"
 msgstr "Información de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "%s requests the presence of %s at a meeting."
 msgstr "%s solicita la presencia de %s en una reunión."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "%s requests your presence at a meeting."
 msgstr "%s solicita su presencia en una reunión."
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "%s wishes to be added to an existing meeting."
 msgstr "%s desea apuntarse a una reunión existente."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Meeting Update"
 msgstr "Actualización de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1390
+#: ../calendar/gui/e-itip-control.c:1391
 #, c-format
 msgid "%s wishes to receive the latest meeting information."
 msgstr "%s desea recibir la última información de la reunión."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1392
 msgid "Meeting Update Request"
 msgstr "Solicitud de actualización de la reunión"
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1399
 #, c-format
 msgid "%s has replied to a meeting request."
 msgstr "%s ha contestado a la solicitud de reunión."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1400
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "%s has canceled a meeting."
 msgstr "%s> ha cancelado una reunión."
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1408
 msgid "Meeting Cancelation"
 msgstr "Cancelación de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
-#: ../calendar/gui/e-itip-control.c:1534
+#: ../calendar/gui/e-itip-control.c:1418 ../calendar/gui/e-itip-control.c:1495
+#: ../calendar/gui/e-itip-control.c:1535
 #, c-format
 msgid "%s has sent an unintelligible message."
 msgstr "%s ha enviado un mensaje ininteligible."
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "%s has published task information."
 msgstr "%s ha publicado la información de la tarea."
 
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "%s requests %s to perform a task."
 msgstr "%s pide a %s que realice una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "%s requests you perform a task."
 msgstr "%s le pide que realice una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1463
 #, c-format
 msgid "%s wishes to be added to an existing task."
 msgstr "%s desea añadirse a una tarea existente."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1464
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1468
 #, c-format
 msgid "%s wishes to receive the latest task information."
 msgstr "%s quiere recibir la última información de la tarea."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1469
 msgid "Task Update Request"
 msgstr "Solicitud de actualización de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1476
 #, c-format
 msgid "%s has replied to a task assignment."
 msgstr "%s ha contestado a una asignación de tarea."
 
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1477
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1484
 #, c-format
 msgid "%s has canceled a task."
 msgstr "%s ha cancelado una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1485
 msgid "Task Cancelation"
 msgstr "Cancelación de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1495
+#: ../calendar/gui/e-itip-control.c:1496
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1520
 #, c-format
 msgid "%s has published free/busy information."
 msgstr "%s ha publicado la información de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1520
+#: ../calendar/gui/e-itip-control.c:1521
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1525
 #, c-format
 msgid "%s requests your free/busy information."
 msgstr "%s pide su información de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1525
+#: ../calendar/gui/e-itip-control.c:1526
 msgid "Free/Busy Request"
 msgstr "Solicitud de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1530
 #, c-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s ha contestado a una solicitud de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1530
+#: ../calendar/gui/e-itip-control.c:1531
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1535
+#: ../calendar/gui/e-itip-control.c:1536
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: ../calendar/gui/e-itip-control.c:1611
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1671
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sólo contiene solicitudes no soportadas."
 
-#: ../calendar/gui/e-itip-control.c:1703
+#: ../calendar/gui/e-itip-control.c:1704
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de calendario válido"
 
-#: ../calendar/gui/e-itip-control.c:1741
+#: ../calendar/gui/e-itip-control.c:1742
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: ../calendar/gui/e-itip-control.c:1983
+#: ../calendar/gui/e-itip-control.c:1984
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:2017
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "Object is invalid and cannot be updated\n"
 msgstr "El objeto es inválido y no puede ser actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2035
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta respuesta no es de un participante. ¿Desea añadirlo como participante?"
 
-#: ../calendar/gui/e-itip-control.c:2053
+#: ../calendar/gui/e-itip-control.c:2054
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "El estado del participante no pudo actualizarse debido a un estado inválido\n"
 
-#: ../calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2078
 msgid "Attendee status updated\n"
 msgstr "Estado del participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../calendar/gui/e-itip-control.c:2085
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado del participante no pudo actualizarse porque ya no existe el "
 "elemento"
 
-#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
+#: ../calendar/gui/e-itip-control.c:2116 ../calendar/gui/e-itip-control.c:2173
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
+#: ../calendar/gui/e-itip-control.c:2122 ../calendar/gui/e-itip-control.c:2181
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo enviarse.\n"
 
-#: ../calendar/gui/e-itip-control.c:2273
+#: ../calendar/gui/e-itip-control.c:2274
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-itip-control.c:2303
 #: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Confirmar"
 
-#: ../calendar/gui/e-itip-control.c:2342
+#: ../calendar/gui/e-itip-control.c:2343
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2366
+#: ../calendar/gui/e-itip-control.c:2367
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../calendar/gui/e-itip-control.c:2367
+#: ../calendar/gui/e-itip-control.c:2368
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:2368
+#: ../calendar/gui/e-itip-control.c:2369
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Rehusar"
 
-#: ../calendar/gui/e-itip-control.c:2393
+#: ../calendar/gui/e-itip-control.c:2394
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:2417
+#: ../calendar/gui/e-itip-control.c:2418
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: ../calendar/gui/e-itip-control.c:2441
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
-#: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:300
+#: ../calendar/gui/e-itip-control.c:2466
+#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../widgets/misc/e-activity-proxy.c:315
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -5394,49 +5393,49 @@ msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:1009
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1010 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
 #: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/print.c:1011
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/print.c:1012
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1026
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:1027
 msgid "Required Participant"
 msgstr "Participante requerido"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1028
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/print.c:1029
 msgid "Non-Participant"
 msgstr "No participan"
 
@@ -5458,7 +5457,7 @@ msgstr "En proceso"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2376
+#: ../calendar/gui/e-meeting-time-sel.c:2373
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -5467,7 +5466,7 @@ msgstr "%A, %d de %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2407
+#: ../calendar/gui/e-meeting-time-sel.c:2404
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5477,63 +5476,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%e/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "No Information"
 msgstr "Sin información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:596
 msgid "O_ptions"
 msgstr "O_pciones"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:628
+#: ../calendar/gui/e-meeting-time-sel.c:625
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:659
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:674
 msgid "_Autopick"
 msgstr "_Auto-seleccionar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:689
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:720
+#: ../calendar/gui/e-meeting-time-sel.c:717
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:727
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:739
+#: ../calendar/gui/e-meeting-time-sel.c:736
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:785
+#: ../calendar/gui/e-meeting-time-sel.c:782
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:822
+#: ../calendar/gui/e-meeting-time-sel.c:819
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
@@ -5618,13 +5617,13 @@ msgstr "Pulse aquí para añadir una nota"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2072
+#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2113
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
+#: ../modules/calendar/e-task-shell-view.c:444
 #: ../plugins/caldav/caldav-browse-server.c:429
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:562
@@ -5660,7 +5659,7 @@ msgstr "Seleccione la zona horaria"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1766
 msgid "%d %B"
 msgstr "%e de %B"
 
@@ -5693,23 +5692,23 @@ msgstr "vista de acontecimientos del calendario"
 msgid "Grab Focus"
 msgstr "Obtener el foco"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Appointment"
 msgstr "Cita nueva"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New All Day Event"
 msgstr "Acontecimiento nuevo para todo el día"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "New Meeting"
 msgstr "Reunión nueva"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Today"
 msgstr "Ir a hoy"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:309
 msgid "Go to Date"
 msgstr "Ir a una fecha"
 
@@ -5718,7 +5717,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:150 ../calendar/gui/ea-week-view.c:149
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5727,14 +5726,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:155 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
 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:162
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vista de la semana laboral: %s. %s"
@@ -5742,47 +5741,47 @@ 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:168
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vista diaria: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "vista de calendario para una semana laboral"
 
-#: ../calendar/gui/ea-day-view.c:204
+#: ../calendar/gui/ea-day-view.c:205
 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:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/gui/ea-gnome-calendar.c:49
+#: ../calendar/gui/ea-gnome-calendar.c:57
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Calendario de GNOME"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1010
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:1011
 msgid "%A %d %b %Y"
 msgstr "%A, %e de %b de %Y"
 
-#: ../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
+#: ../calendar/gui/ea-gnome-calendar.c:205
+#: ../calendar/gui/ea-gnome-calendar.c:210
+#: ../calendar/gui/ea-gnome-calendar.c:212
+#: ../modules/calendar/e-cal-shell-view-private.c:1018
+#: ../modules/calendar/e-cal-shell-view-private.c:1024
+#: ../modules/calendar/e-cal-shell-view-private.c:1027
 msgid "%a %d %b %Y"
 msgstr "%a, %e de %b de %Y"
 
-#: ../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
-#: ../modules/calendar/e-cal-shell-view-private.c:1064
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../calendar/gui/ea-gnome-calendar.c:235
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:243
+#: ../modules/calendar/e-cal-shell-view-private.c:1044
+#: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../modules/calendar/e-cal-shell-view-private.c:1062
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
 msgid "%d %b %Y"
 msgstr "%e de %B de %Y"
 
@@ -5794,25 +5793,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:157
+#: ../calendar/gui/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vista mensual: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vista semanal: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:196
 msgid "calendar view for a month"
 msgstr "vista de calendario para un mes"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:198
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para una o más semanas"
 
-#: ../calendar/gui/gnome-cal.c:2306
+#: ../calendar/gui/gnome-cal.c:2313
 msgid "Purging"
 msgstr "Compactando"
 
@@ -5996,225 +5995,225 @@ msgstr "No se pudo reservar un recurso, error: "
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante en el acontecimiento."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:522
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Th"
 msgstr "Ju"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Fr"
 msgstr "Vi"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Sa"
 msgstr "Sa"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2513
 msgid " to "
 msgstr " a "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:2457
+#: ../calendar/gui/print.c:2521
 msgid " (Completed "
 msgstr " (Completado "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2461
+#: ../calendar/gui/print.c:2525
 msgid "Completed "
 msgstr "Completado "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2469
+#: ../calendar/gui/print.c:2533
 msgid " (Due "
 msgstr " (Vence "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2538
 msgid "Due "
 msgstr "Vence "
 
-#: ../calendar/gui/print.c:2637
+#: ../calendar/gui/print.c:2701
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %s"
 
-#: ../calendar/gui/print.c:2661
+#: ../calendar/gui/print.c:2725
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2704
+#: ../calendar/gui/print.c:2768
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2719
+#: ../calendar/gui/print.c:2783
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:2737
+#: ../calendar/gui/print.c:2801
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:2748
+#: ../calendar/gui/print.c:2812
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2761
+#: ../calendar/gui/print.c:2825
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2772
+#: ../calendar/gui/print.c:2836
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -6241,7 +6240,7 @@ msgstr "Reuniones y citas"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1835
+#: ../plugins/itip-formatter/itip-formatter.c:1942
 msgid "Opening calendar"
 msgstr "Apertura del calendario"
 
@@ -7972,12 +7971,12 @@ msgid "Save as..."
 msgstr "Guardar como…"
 
 #: ../composer/e-composer-actions.c:245
-#: ../widgets/misc/e-attachment-view.c:379
+#: ../widgets/misc/e-attachment-view.c:381
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
 #: ../composer/e-composer-actions.c:250
-#: ../widgets/misc/e-signature-editor.c:206
+#: ../widgets/misc/e-signature-editor.c:208
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -8013,7 +8012,7 @@ msgstr "Guardar como _borrador"
 msgid "Save as draft"
 msgstr "Guardar como borrador"
 
-#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:298
 msgid "S_end"
 msgstr "_Enviar"
 
@@ -8165,33 +8164,33 @@ 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:215
+#: ../composer/e-composer-private.c:216
 msgid "Undo the last action"
 msgstr "Deshacer la última acción"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:220
 msgid "Redo the last undone action"
 msgstr "Rehacer la última acción deshecha"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:224
 msgid "Search for text"
 msgstr "Buscar texto"
 
-#: ../composer/e-composer-private.c:227
+#: ../composer/e-composer-private.c:228
 msgid "Search for and replace text"
 msgstr "Buscar y reemplazar texto"
 
-#: ../composer/e-composer-private.c:317
+#: ../composer/e-composer-private.c:318
 msgid "Save draft"
 msgstr "Guardar borrador"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:197
+#: ../composer/e-msg-composer.c:210
 #: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "_No mostrar otra vez este mensaje."
 
-#: ../composer/e-msg-composer.c:1030
+#: ../composer/e-msg-composer.c:1051
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -8199,7 +8198,7 @@ msgstr ""
 "No es posible firmar el mensaje saliente: No hay establecido un certificado "
 "de firma para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1042
+#: ../composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -8208,17 +8207,17 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1466 ../composer/e-msg-composer.c:1811
+#: ../composer/e-msg-composer.c:1491 ../composer/e-msg-composer.c:1825
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:3477
+#: ../composer/e-msg-composer.c:3515
 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:4085
+#: ../composer/e-msg-composer.c:4130
 msgid "Untitled Message"
 msgstr "Mensaje sin título"
 
@@ -8321,7 +8320,6 @@ msgid "Unable to activate the address selector control."
 msgstr "No es posible activar el control de selección de direcciones."
 
 #: ../composer/mail-composer.error.xml.h:21
-#| msgid "You cannot attach the file n{0}' to this message."
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "No puede adjuntar el archivo «{0}» a este mensaje."
 
@@ -8345,24 +8343,24 @@ msgstr "_Recuperar"
 msgid "_Save Draft"
 msgstr "Guardar _borrador"
 
-#: ../capplet/anjal-settings-main.c:198
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
 msgstr "Ejecutar Anjal en una ventana"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../capplet/anjal-settings-main.c:224
 msgid "Make Anjal the default email client"
 msgstr "Hacer que Anjal sea el cliente de correo predeterminado"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:206
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
 msgstr "El ID del socket en el que empotrarse"
 
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:220
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
 msgstr "Cliente de correo Anjal"
 
@@ -8406,12 +8404,10 @@ msgid "Email address:"
 msgstr "Dirección de correo-e:"
 
 #: ../capplet/settings/mail-account-view.c:490
-#| msgid "Details"
 msgid "Details:"
 msgstr "Detalles:"
 
 #: ../capplet/settings/mail-account-view.c:498
-#| msgid "Receiving mail"
 msgid "Receiving"
 msgstr "Recepción de correo"
 
@@ -8437,7 +8433,6 @@ msgid "never"
 msgstr "nunca"
 
 #: ../capplet/settings/mail-account-view.c:549
-#| msgid "Ascending"
 msgid "Sending"
 msgstr "Opciones de envío"
 
@@ -8487,8 +8482,7 @@ msgstr ""
 "obtener su correo."
 
 #: ../capplet/settings/mail-account-view.c:614
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
-#: ../mail/mail-config.ui.h:62
+#: ../mail/em-account-editor.c:2146 ../mail/em-account-editor.c:2267
 msgid "Identity"
 msgstr "Identidad"
 
@@ -8540,7 +8534,7 @@ msgid "Back - Receiving options"
 msgstr "Atrás - Opciones de recepción"
 
 #: ../capplet/settings/mail-account-view.c:619
-#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
+#: ../mail/em-account-editor.c:3055
 msgid "Defaults"
 msgstr "Predeterminados"
 
@@ -8573,7 +8567,6 @@ msgid "You may need to enable IMAP access."
 msgstr "Puede que deba activar el acceso IMAP."
 
 #: ../capplet/settings/mail-account-view.c:740
-#| msgid "Backing Evolution accounts and settings"
 msgid "Google account settings:"
 msgstr "Configuración de la cuenta de Google:"
 
@@ -8592,7 +8585,6 @@ msgstr ""
 "calendario si no es correcto."
 
 #: ../capplet/settings/mail-account-view.c:778
-#| msgid "Backing Evolution accounts and settings"
 msgid "Yahoo account settings:"
 msgstr "Configuración de la cuenta de Yahoo:"
 
@@ -8613,17 +8605,17 @@ msgstr "Cerrar solapa"
 msgid "Account Wizard"
 msgstr "Asistente de cuentas"
 
-#: ../capplet/settings/mail-capplet-shell.c:208
+#: ../capplet/settings/mail-capplet-shell.c:211
 msgid "Evolution account assistant"
 msgstr "Asistente de cuentas de Evolution"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../capplet/settings/mail-capplet-shell.c:345 ../mail/e-mail-migrate.c:672
+#: ../mail/e-mail-store.c:218 ../mail/em-folder-tree-model.c:148
 #: ../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:207
-#: ../mail/message-list.c:1666
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:208
+#: ../mail/message-list.c:1671
 #: ../modules/addressbook/e-book-shell-backend.c:96
 #: ../modules/addressbook/e-book-shell-migrate.c:130
 #: ../modules/calendar/e-cal-shell-backend.c:102
@@ -8637,7 +8629,6 @@ msgstr "En este equipo"
 
 #: ../capplet/settings/mail-settings-view.c:146
 #, c-format
-#| msgid "Modify"
 msgid "Modify %s..."
 msgstr "Modificar %s…"
 
@@ -8661,7 +8652,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:845
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:848
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8687,42 +8678,27 @@ msgid "Email Settings"
 msgstr "Ajustes del correo"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:228
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (cancelado)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (completado)"
 
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../e-util/e-activity.c:235
+#: ../e-util/e-activity.c:270
 #, c-format
-msgid "%s..."
-msgstr "%s…"
+msgid "%s"
+msgstr "%s"
 
-#: ../e-util/e-activity.c:240
+#: ../e-util/e-activity.c:275
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
-#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
-msgid "Evolution Error"
-msgstr "Error de Evolution"
-
-#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
-msgid "Evolution Warning"
-msgstr "Advertencia de Evolution"
-
-#: ../e-util/e-alert.c:659
-#, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "Error interno, solicitado un error desconocido «%s»"
-
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "Árabe"
@@ -8881,12 +8857,12 @@ msgstr "Mensajes de sucesos:"
 msgid "Log Level"
 msgstr "Nivel de sucesos"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2745
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:113
 #: ../shell/e-shell-window-actions.c:1426
 #: ../shell/e-shell-window-actions.c:1433
 #: ../shell/e-shell-window-actions.c:1440
@@ -8959,7 +8935,7 @@ msgstr "¿Quiere sobreescribirlo?"
 msgid "File exists \"{0}\"."
 msgstr "El archivo existe «{0}»."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:145
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
@@ -8980,104 +8956,106 @@ msgstr "Error de GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "En adelante todos los errores sólo se mostrarán en el terminal."
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1038
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "De"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
 #: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
-#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2391 ../mail/em-format-html.c:2453
+#: ../mail/em-format-html.c:2476 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
-#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2392 ../mail/em-format-html.c:2457
+#: ../mail/em-format-html.c:2479 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Cco"
 
-#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1043
+#: ../em-format/em-format-quote.c:422 ../em-format/em-format.c:1055
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
-#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
+#: ../plugins/groupwise-features/notification.ui.h:2
+#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Asunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1120
+#: ../em-format/em-format-quote.c:433 ../mail/em-format-html.c:2573
+#: ../modules/mail/em-mailer-prefs.c:1040
 msgid "Mailer"
 msgstr "Transporte"
 
-#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1296
+#: ../em-format/em-format-quote.c:514 ../mail/em-composer-utils.c:1311
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: ../em-format/em-format.c:1044 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
-#: ../widgets/misc/e-dateedit.c:549
+#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:530
+#: ../widgets/misc/e-dateedit.c:552
 msgid "Date"
 msgstr "Fecha"
 
-#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
-#: ../em-format/em-format.c:1046 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Cara"
 
-#: ../em-format/em-format.c:1431
+#: ../em-format/em-format.c:1453
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: ../em-format/em-format.c:1503
+#: ../em-format/em-format.c:1528
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido"
 
-#: ../em-format/em-format.c:1662 ../em-format/em-format.c:1846
+#: ../em-format/em-format.c:1710 ../em-format/em-format.c:1906
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente."
 
-#: ../em-format/em-format.c:1672
+#: ../em-format/em-format.c:1720
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado no soportado para multipart/encrypted"
 
-#: ../em-format/em-format.c:1688
+#: ../em-format/em-format.c:1739
 msgid "Could not parse PGP/MIME message"
 msgstr "No es posible interpretar el mensaje PGP/MIME"
 
-#: ../em-format/em-format.c:1689
+#: ../em-format/em-format.c:1740
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "No se pudo interpretar el mensaje PGP/MIME: Error desconocido"
 
-#: ../em-format/em-format.c:1871
+#: ../em-format/em-format.c:1931
 msgid "Unsupported signature format"
 msgstr "Formato de firma no soportado"
 
-#: ../em-format/em-format.c:1881 ../em-format/em-format.c:2041
+#: ../em-format/em-format.c:1944 ../em-format/em-format.c:2117
 msgid "Error verifying signature"
 msgstr "Error al verificar la firma"
 
-#: ../em-format/em-format.c:1882 ../em-format/em-format.c:2029
-#: ../em-format/em-format.c:2042
+#: ../em-format/em-format.c:1945 ../em-format/em-format.c:2104
+#: ../em-format/em-format.c:2118
 msgid "Unknown error verifying signature"
 msgstr "Error desconocido al verificar la firma"
 
-#: ../em-format/em-format.c:2129
+#: ../em-format/em-format.c:2209
 msgid "Could not parse PGP message: "
 msgstr "No se pudo analizar el mensaje PGP: "
 
-#: ../em-format/em-format.c:2135 ../plugins/caldav/caldav-browse-server.c:203
+#: ../em-format/em-format.c:2215 ../mail/mail-ops.c:604
+#: ../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"
@@ -9254,12 +9232,12 @@ msgstr "I_ncluir conversaciones"
 msgid "A_dd Condition"
 msgstr "Añadir a_cción"
 
-#: ../filter/e-filter-rule.c:1128 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:304
+#: ../filter/e-filter-rule.c:1126 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:302
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1126 ../mail/em-utils.c:303
 msgid "Outgoing"
 msgstr "Saliente"
 
@@ -9291,7 +9269,7 @@ msgstr "Falta la fecha."
 msgid "Missing file name."
 msgstr "Falta el nombre de archivo."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
 msgid "Missing name."
 msgstr "Falta el nombre."
 
@@ -9368,7 +9346,7 @@ msgstr "en el futuro"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
+#: ../filter/filter.ui.h:19
 msgid "seconds"
 msgstr "segundos"
 
@@ -9385,7 +9363,7 @@ msgid "years"
 msgstr "años"
 
 #: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
-#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
+#: ../mail/em-format-html-display.c:1055 ../mail/mail-config.ui.h:13
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
 #: ../widgets/misc/e-attachment-paned.c:134
 msgid "Attachment"
@@ -9394,16 +9372,16 @@ msgstr[0] "Adjunto"
 msgstr[1] "Adjuntos"
 
 #: ../mail/e-mail-attachment-bar.c:611
-#: ../widgets/misc/e-attachment-paned.c:599
+#: ../widgets/misc/e-attachment-paned.c:600
 msgid "Icon View"
 msgstr "Vista de icono"
 
 #: ../mail/e-mail-attachment-bar.c:612
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../widgets/misc/e-attachment-paned.c:601
 msgid "List View"
 msgstr "Vista de lista"
 
-#: ../mail/e-mail-browser.c:265
+#: ../mail/e-mail-browser.c:268
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -9473,16 +9451,16 @@ msgid "Color"
 msgstr "Color"
 
 #: ../mail/e-mail-label-tree-view.c:96
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
 #: ../plugins/caldav/caldav-browse-server.c:1163
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
 #: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 msgid "Name"
 msgstr "Nombre"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2761
+#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2840
 #: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "Bandeja de entrada"
@@ -9501,7 +9479,7 @@ msgstr "Correo enviado"
 
 #: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:578
+#: ../plugins/templates/templates.c:580
 msgid "Templates"
 msgstr "Plantillas"
 
@@ -9518,11 +9496,11 @@ msgstr "Migración"
 msgid "Migrating '%s':"
 msgstr "Migrando «%s»:"
 
-#: ../mail/e-mail-migrate.c:649
+#: ../mail/e-mail-migrate.c:652
 msgid "Migrating Folders"
 msgstr "Migrando carpetas"
 
-#: ../mail/e-mail-migrate.c:650
+#: ../mail/e-mail-migrate.c:653
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9534,7 +9512,7 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas…"
 
-#: ../mail/e-mail-migrate.c:796
+#: ../mail/e-mail-migrate.c:809
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "No se pueden crear las carpetas de correo local en: «%s»: %s"
@@ -9551,33 +9529,33 @@ msgstr "Seleccionar una carpeta"
 msgid "Do not ask me again"
 msgstr "No preguntarme de nuevo"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:272 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:272 ../mail/em-folder-utils.c:412
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:742 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:742 ../mail/em-folder-utils.c:412
 msgid "_Move"
 msgstr "_Mover"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
-#: ../mail/e-mail-reader.c:1111
+#: ../mail/e-mail-reader.c:1008 ../mail/e-mail-reader.c:1128
+#: ../mail/e-mail-reader.c:1169
 msgid "_Do not ask me again."
 msgstr "_No preguntarme de nuevo."
 
-#: ../mail/e-mail-reader.c:1116
+#: ../mail/e-mail-reader.c:1174
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar siempre «Responder a:» para las listas de correo."
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1266
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Guardar mensaje"
@@ -9589,541 +9567,542 @@ 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:1227
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/e-mail-reader.c:1287
+#: ../plugins/groupwise-features/notification.ui.h:1
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaje"
 msgstr[1] "Mensajes"
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1553
 msgid "A_dd Sender to Address Book"
 msgstr "_Añadir remitente a la libreta"
 
-#: ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1555
 msgid "Add sender to address book"
 msgstr "Añadir el remitente a la libreta de direcciones"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1560
 msgid "Check for _Junk"
 msgstr "Detectar _SPAM"
 
-#: ../mail/e-mail-reader.c:1501
+#: ../mail/e-mail-reader.c:1562
 msgid "Filter the selected messages for junk status"
 msgstr "Filtra los mensajes seleccionados por el estado de SPAM"
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1567
 msgid "_Copy to Folder..."
 msgstr "Copiar a la c_arpeta…"
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1569
 msgid "Copy selected messages to another folder"
 msgstr "Copia mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1574
 msgid "_Delete Message"
 msgstr "_Eliminar el mensaje"
 
-#: ../mail/e-mail-reader.c:1515
+#: ../mail/e-mail-reader.c:1576
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para eliminar"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1581
 msgid "Filter on Mailing _List..."
 msgstr "Filtro según la _lista de correo…"
 
-#: ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1583
 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:1527
+#: ../mail/e-mail-reader.c:1588
 msgid "Filter on _Recipients..."
 msgstr "Filtro según los _destinatarios…"
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1590
 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:1534
+#: ../mail/e-mail-reader.c:1595
 msgid "Filter on Se_nder..."
 msgstr "Filtro según el _remitente…"
 
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1597
 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:1541
+#: ../mail/e-mail-reader.c:1602
 msgid "Filter on _Subject..."
 msgstr "Filtro según el _asunto…"
 
-#: ../mail/e-mail-reader.c:1543
+#: ../mail/e-mail-reader.c:1604
 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:1548
+#: ../mail/e-mail-reader.c:1609
 msgid "A_pply Filters"
 msgstr "Aplicar _filtros"
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1611
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplica filtros a los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1616
 msgid "_Find in Message..."
 msgstr "B_uscar en el mensaje…"
 
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1618
 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:1562
+#: ../mail/e-mail-reader.c:1623
 msgid "_Clear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/e-mail-reader.c:1564
+#: ../mail/e-mail-reader.c:1625
 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:1569
+#: ../mail/e-mail-reader.c:1630
 msgid "_Flag Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../mail/e-mail-reader.c:1571
+#: ../mail/e-mail-reader.c:1632
 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:1576
+#: ../mail/e-mail-reader.c:1637
 msgid "Follow _Up..."
 msgstr "Se_guimiento…"
 
-#: ../mail/e-mail-reader.c:1578
+#: ../mail/e-mail-reader.c:1639
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar los mensajes seleccionados para seguimiento"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1644
 msgid "_Attached"
 msgstr "_Adjunto"
 
-#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1646 ../mail/e-mail-reader.c:1653
 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:1590
+#: ../mail/e-mail-reader.c:1651
 msgid "Forward As _Attached"
 msgstr "Reenviar como _adjunto"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1658
 msgid "_Inline"
 msgstr "_Incluido en línea"
 
-#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1660 ../mail/e-mail-reader.c:1667
 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:1604
+#: ../mail/e-mail-reader.c:1665
 msgid "Forward As _Inline"
 msgstr "Reenviar en _línea"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1672
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
+#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:1681
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenvía el mensaje seleccionado citado como una respuesta"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1679
 msgid "Forward As _Quoted"
 msgstr "Reenviar como ci_tado"
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1686
 msgid "_Load Images"
 msgstr "Cargar _imágenes"
 
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1688
 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:1632
+#: ../mail/e-mail-reader.c:1693
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1695
 msgid "Mark the selected messages as important"
 msgstr "Marcar los mensajes seleccionados como importantes"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:1700
 msgid "_Junk"
 msgstr "_SPAM"
 
-#: ../mail/e-mail-reader.c:1641
+#: ../mail/e-mail-reader.c:1702
 msgid "Mark the selected messages as junk"
 msgstr "Marcar los mensajes seleccionados como SPAM"
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:1707
 msgid "_Not Junk"
 msgstr "No es SPA_M"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:1709
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar los mensajes seleccionados como no SPAM"
 
-#: ../mail/e-mail-reader.c:1653
+#: ../mail/e-mail-reader.c:1714
 msgid "_Read"
 msgstr "_Leído"
 
-#: ../mail/e-mail-reader.c:1655
+#: ../mail/e-mail-reader.c:1716
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leídos"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:1721
 msgid "Uni_mportant"
 msgstr "N_o importante"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1723
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar los mensajes seleccionados como no importantes"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:1728
 msgid "_Unread"
 msgstr "_No leído"
 
-#: ../mail/e-mail-reader.c:1669
+#: ../mail/e-mail-reader.c:1730
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leídos"
 
-#: ../mail/e-mail-reader.c:1674
+#: ../mail/e-mail-reader.c:1735
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo…"
 
-#: ../mail/e-mail-reader.c:1676
+#: ../mail/e-mail-reader.c:1737
 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:1681
+#: ../mail/e-mail-reader.c:1742
 msgid "Compose _New Message"
 msgstr "Redactar un mensaje _nuevo"
 
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:1744
 msgid "Open a window for composing a mail message"
 msgstr "Abre una ventana para escribir un mensaje de correo"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:1749
 msgid "_Open in New Window"
 msgstr "_Abrir en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:1690
+#: ../mail/e-mail-reader.c:1751
 msgid "Open the selected messages in a new window"
 msgstr "Abre los mensajes seleccionados en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:1756
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta…"
 
-#: ../mail/e-mail-reader.c:1697
+#: ../mail/e-mail-reader.c:1758
 msgid "Move selected messages to another folder"
 msgstr "Mueve los mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:1763
 msgid "_Switch to Folder"
 msgstr "_Cambiar a la carpeta"
 
-#: ../mail/e-mail-reader.c:1704
+#: ../mail/e-mail-reader.c:1765
 msgid "Display the parent folder"
 msgstr "Mostrar la carpeta padre"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:1770
 msgid "Switch to _next tab"
 msgstr "Cambiar a la _siguiente solapa"
 
-#: ../mail/e-mail-reader.c:1711
+#: ../mail/e-mail-reader.c:1772
 msgid "Switch to the next tab"
 msgstr "Cambiar a la siguiente solapa"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:1777
 msgid "Switch to _previous tab"
 msgstr "Cambiar a la solapa _anterior"
 
-#: ../mail/e-mail-reader.c:1718
+#: ../mail/e-mail-reader.c:1779
 msgid "Switch to the previous tab"
 msgstr "Cambiar a la solapa anterior"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:1784
 msgid "Cl_ose current tab"
 msgstr "C_errar la solapa actual"
 
-#: ../mail/e-mail-reader.c:1725
+#: ../mail/e-mail-reader.c:1786
 msgid "Close current tab"
 msgstr "Cerrar la solapa actual"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:1791
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1793
 msgid "Display the next message"
 msgstr "Mostrar el mensaje siguiente"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:1798
 msgid "Next _Important Message"
 msgstr "Mensaje siguiente _importante"
 
-#: ../mail/e-mail-reader.c:1739
+#: ../mail/e-mail-reader.c:1800
 msgid "Display the next important message"
 msgstr "Mostrar el mensaje siguiente importante"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:1805
 msgid "Next _Thread"
 msgstr "_Conversación siguiente"
 
-#: ../mail/e-mail-reader.c:1746
+#: ../mail/e-mail-reader.c:1807
 msgid "Display the next thread"
 msgstr "Mostrar la siguiente conversación"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:1812
 msgid "Next _Unread Message"
 msgstr "Mensaje siguiente _no leído"
 
-#: ../mail/e-mail-reader.c:1753
+#: ../mail/e-mail-reader.c:1814
 msgid "Display the next unread message"
 msgstr "Mostrar el siguiente mensaje no leído"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:1819
 msgid "_Previous Message"
 msgstr "Mensaje _anterior"
 
-#: ../mail/e-mail-reader.c:1760
+#: ../mail/e-mail-reader.c:1821
 msgid "Display the previous message"
 msgstr "Mostrar el mensaje anterior"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:1826
 msgid "Pr_evious Important Message"
 msgstr "Mensaje anterior i_mportante"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1828
 msgid "Display the previous important message"
 msgstr "Mostrar el anterior mensaje importante"
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:1833
 msgid "P_revious Unread Message"
 msgstr "Mensaje anterior n_o leído"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1835
 msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no leído"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1842
 msgid "Print this message"
 msgstr "Imprime este mensaje"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1849
 msgid "Preview the message to be printed"
 msgstr "Vista previa del mensaje que va a imprimirse"
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1854
 msgid "Re_direct"
 msgstr "Re_dirigir"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1856
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirige (rebotar) el mensaje seleccionado a alguien"
 
-#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
+#: ../mail/e-mail-reader.c:1861 ../mail/mail.error.xml.h:93
 #: ../modules/calendar/e-cal-shell-view-actions.c:1459
 #: ../modules/mail/e-mail-attachment-handler.c:151
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1863
 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:1807 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:1868 ../mail/mail.error.xml.h:94
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1870
 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:1814
+#: ../mail/e-mail-reader.c:1875
 #: ../modules/mail/e-mail-attachment-handler.c:158
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1877
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responde al remitente del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:1882
 msgid "_Save as mbox..."
 msgstr "_Guardar como mbox…"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1884
 msgid "Save selected messages as an mbox file"
 msgstr "Guarda los mensajes como un archivo mbox"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1889
 msgid "Search Folder from Mailing _List..."
 msgstr "Carpeta de búsqueda según la l_ista de correo…"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1891
 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:1835
+#: ../mail/e-mail-reader.c:1896
 msgid "Search Folder from Recipien_ts..."
 msgstr "Carpeta de búsqueda según los des_tinatarios…"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1898
 msgid "Create a search folder for these recipients"
 msgstr "Crear una carpeta de búsqueda para estos destinatarios"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:1903
 msgid "Search Folder from Sen_der..."
 msgstr "Carpeta de búsqueda según el r_emitente…"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1905
 msgid "Create a search folder for this sender"
 msgstr "Crear una carpeta de búsqueda para este remitente"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:1910
 msgid "Search Folder from S_ubject..."
 msgstr "Carpeta de búsqueda según el a_sunto…"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1912
 msgid "Create a search folder for this subject"
 msgstr "Crear una carpeta de búsqueda para este asunto"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:1917
 msgid "_Message Source"
 msgstr "Me_nsaje en bruto"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1919
 msgid "Show the raw email source of the message"
 msgstr "Mostrar mensaje de correo-e en bruto"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:1931
 msgid "_Undelete Message"
 msgstr "_Recuperar mensaje"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1933
 msgid "Undelete the selected messages"
 msgstr "Recupera los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:1938
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1940
 msgid "Reset the text to its original size"
 msgstr "Restablecer el texto a su tamaño original"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1945
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1947
 msgid "Increase the text size"
 msgstr "Incrementar el tamaño del texto"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1952
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1954
 msgid "Decrease the text size"
 msgstr "Reduce el tamaño del texto"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1961
 msgid "Create R_ule"
 msgstr "Crear _regla"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1968
 msgid "Ch_aracter Encoding"
 msgstr "C_odificación de caracteres"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1975
 msgid "F_orward As"
 msgstr "Reenviar _como"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1982
 msgid "_Group Reply"
 msgstr "_Responder al grupo"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1989
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1996
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2003
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2010
 msgid "_Zoom"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2035
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimiento…"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:2043
 msgid "Mark as _Important"
 msgstr "Marcar como imp_ortante"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2047
 msgid "Mark as _Junk"
 msgstr "Marcar como _SPAM"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2051
 msgid "Mark as _Not Junk"
 msgstr "Marcar como no _SPAM"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2055
 msgid "Mar_k as Read"
 msgstr "Marcar como _leído"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2059
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como no imp_ortante"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2063
 msgid "Mark as _Unread"
 msgstr "Marcar como no _leído"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2099
 msgid "_Caret Mode"
 msgstr "Activar cu_rsor"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2101
 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:2046
+#: ../mail/e-mail-reader.c:2107
 msgid "All Message _Headers"
 msgstr "_Todas las cabeceras del mensaje"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2109
 msgid "Show messages with all email headers"
 msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2332
 msgid "Unable to retrieve message"
 msgstr "No se pudo obtener el mensaje"
 
-#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2392 ../mail/mail-ops.c:1927
 #, 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:2893 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:2959 ../mail/mail-config.ui.h:29
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
@@ -10131,45 +10110,45 @@ msgstr "Obteniendo mensaje «%s»"
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/e-mail-reader.c:3041
+#: ../mail/e-mail-reader.c:3107
 #: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../mail/e-mail-reader.c:3042
+#: ../mail/e-mail-reader.c:3108
 msgid "Forward the selected message to someone"
 msgstr "Reenvía a alguien el mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:3061
+#: ../mail/e-mail-reader.c:3127
 msgid "Group Reply"
 msgstr "Responder al grupo"
 
-#: ../mail/e-mail-reader.c:3062
+#: ../mail/e-mail-reader.c:3128
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Responder a la lista de correo o a todos los destinatarios"
 
-#: ../mail/e-mail-reader.c:3107 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:743
+#: ../mail/e-mail-reader.c:3173 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:744
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:3140
+#: ../mail/e-mail-reader.c:3206
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../mail/e-mail-reader.c:3144
+#: ../mail/e-mail-reader.c:3210
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3154 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3220 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:3784
 #, c-format
 msgid "Folder '%s'"
 msgstr "Carpeta «%s»"
@@ -10180,7 +10159,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:512 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:510 ../mail/mail-config.ui.h:67
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Sin cifrado"
@@ -10188,7 +10167,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:516 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:514 ../mail/mail-config.ui.h:121
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
@@ -10196,17 +10175,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:520 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:518 ../mail/mail-config.ui.h:89
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/em-account-editor.c:607
+#: ../mail/em-account-editor.c:605
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acuerdo de licencia %s"
 
-#: ../mail/em-account-editor.c:614
+#: ../mail/em-account-editor.c:612
 #, c-format
 msgid ""
 "\n"
@@ -10220,34 +10199,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:901 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:899 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../mail/em-account-editor.c:985
+#: ../mail/em-account-editor.c:983
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:986
+#: ../mail/em-account-editor.c:984
 msgid "Always"
 msgstr "Siempre"
 
-#: ../mail/em-account-editor.c:987
+#: ../mail/em-account-editor.c:985
 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:1723 ../widgets/misc/e-account-tree-view.c:128
+#: ../mail/em-account-editor.c:1768 ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2143
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2144
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10257,7 +10236,7 @@ msgstr ""
 "\n"
 "Pulse «Adelante» para comenzar. "
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2147
 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 "
@@ -10267,20 +10246,19 @@ 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:2104 ../mail/em-account-editor.c:2261
-#: ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:2149 ../mail/em-account-editor.c:2311
 msgid "Receiving Email"
 msgstr "Recepción de correo"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2150
 msgid "Please configure the following account settings."
 msgstr "Configure las siguientes opciones de la cuenta."
 
-#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
+#: ../mail/em-account-editor.c:2152 ../mail/em-account-editor.c:2799
 msgid "Sending Email"
 msgstr "Envío de correo"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2153
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10289,11 +10267,11 @@ msgstr ""
 "seguro, pregúntele a su administrador de sistemas o a su Proveedor de "
 "Servicios de Internet."
 
-#: ../mail/em-account-editor.c:2110
+#: ../mail/em-account-editor.c:2155
 msgid "Account Management"
 msgstr "Administración de cuentas"
 
-#: ../mail/em-account-editor.c:2111
+#: ../mail/em-account-editor.c:2156
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10301,11 +10279,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:2115
+#: ../mail/em-account-editor.c:2160
 msgid "Done"
 msgstr "Hecho"
 
-#: ../mail/em-account-editor.c:2116
+#: ../mail/em-account-editor.c:2161
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10319,52 +10297,52 @@ msgstr ""
 "\n"
 "Pulse «Aplicar» para guardar su configuración."
 
-#: ../mail/em-account-editor.c:2557
+#: ../mail/em-account-editor.c:2613
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay mensajes _nuevos cada"
 
-#: ../mail/em-account-editor.c:2565
+#: ../mail/em-account-editor.c:2621
 msgid "minu_tes"
 msgstr "minuto_s"
 
-#: ../mail/em-account-editor.c:2841
+#: ../mail/em-account-editor.c:2903
 msgid "Please select a folder from the current account."
 msgstr "Seleccionar una carpeta de la cuenta actual."
 
-#: ../mail/em-account-editor.c:3111 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3183 ../mail/mail-config.ui.h:96
 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:3156 ../mail/em-account-editor.c:3224
+#: ../mail/em-account-editor.c:3228 ../mail/em-account-editor.c:3296
 msgid "Receiving Options"
 msgstr "Opciones de recepción"
 
-#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
+#: ../mail/em-account-editor.c:3229 ../mail/em-account-editor.c:3297
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1729
+#: ../mail/em-composer-utils.c:1744
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Su mensaje para %s acerca de «%s» se ha leído el «%s»"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1777
+#: ../mail/em-composer-utils.c:1794
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Notificación de entrega para: «%s»"
 
-#: ../mail/em-composer-utils.c:2186
+#: ../mail/em-composer-utils.c:2204
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2233
+#: ../mail/em-composer-utils.c:2251
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10372,15 +10350,15 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribió:"
 
-#: ../mail/em-composer-utils.c:2377
+#: ../mail/em-composer-utils.c:2395
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
-#: ../mail/em-composer-utils.c:2589
+#: ../mail/em-composer-utils.c:2607
 msgid "Posting destination"
 msgstr "Destino de publicación"
 
-#: ../mail/em-composer-utils.c:2590
+#: ../mail/em-composer-utils.c:2608
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
@@ -10501,7 +10479,7 @@ msgstr "no está configurado"
 msgid "is set"
 msgstr "está configurado"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:58
 msgid "Junk"
 msgstr "SPAM"
 
@@ -10550,7 +10528,7 @@ msgid "Play Sound"
 msgstr "Reproducir un sonido"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "Leído"
 
@@ -10665,7 +10643,6 @@ msgid "Quota usage"
 msgstr "Uso de cuota"
 
 #: ../mail/em-folder-properties.c:288
-#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Propiedades de la carpeta"
 
@@ -10673,11 +10650,11 @@ msgstr "Propiedades de la carpeta"
 msgid "<click here to select a folder>"
 msgstr "<pulse aquí para seleccionar una carpeta>"
 
-#: ../mail/em-folder-selector.c:264
+#: ../mail/em-folder-selector.c:262
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:268
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
@@ -10685,7 +10662,7 @@ msgstr "_Nombre de la carpeta:"
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 #: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1067 ../mail/mail-vfolder.c:1132
+#: ../mail/mail-vfolder.c:1080 ../mail/mail-vfolder.c:1145
 msgid "Search Folders"
 msgstr "Carpetas de búsqueda"
 
@@ -10694,102 +10671,84 @@ msgstr "Carpetas de búsqueda"
 msgid "UNMATCHED"
 msgstr "NO COINCIDENTE"
 
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1043
 msgid "Loading..."
 msgstr "Cargando…"
 
-#: ../mail/em-folder-tree.c:184
+#: ../mail/em-folder-tree.c:193
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:614
 msgid "Folder names cannot contain '/'"
 msgstr "Los nombres de carpetas no pueden contener el carácter «/»"
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1084
+#: ../mail/em-folder-tree.c:1089
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1318
+#: ../mail/em-folder-tree.c:1328
 msgid "Mail Folder Tree"
 msgstr "Árbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1650 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1654 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:1663 ../mail/message-list.c:2170
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:1667 ../mail/message-list.c:2172
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1650
+#: ../mail/em-folder-tree.c:1684
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se puede dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:413
 msgid "Move Folder To"
 msgstr "Mover carpeta a"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:413
 msgid "Copy Folder To"
 msgstr "Copiar carpeta a"
 
-#: ../mail/em-folder-utils.c:533
-#: ../plugins/groupwise-features/share-folder-common.c:136
+#: ../mail/em-folder-utils.c:543
+#: ../plugins/groupwise-features/share-folder-common.c:137
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Creando carpeta «%s»"
 
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:708
 msgid "Create Folder"
 msgstr "Crear carpeta"
 
-#: ../mail/em-folder-utils.c:694
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../mail/em-folder-utils.c:709
+#: ../plugins/groupwise-features/install-shared.c:170
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-folder-utils.c:714
+#: ../mail/em-folder-utils.c:729
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Desuscribiéndose de la carpeta «%s»"
 
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1603
 msgid "Unsigned"
 msgstr "No firmado"
 
@@ -10801,7 +10760,7 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1604
 msgid "Valid signature"
 msgstr "Firma válida"
 
@@ -10813,7 +10772,7 @@ msgstr ""
 "Este mensaje está firmado y es válido, lo que significa que es muy probable "
 "que el mensaje sea auténtico."
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1605
 msgid "Invalid signature"
 msgstr "Firma no válida"
 
@@ -10825,7 +10784,7 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1606
 msgid "Valid signature, but cannot verify sender"
 msgstr "Firma válida, pero no se puede verificar el remitente"
 
@@ -10837,7 +10796,7 @@ msgstr ""
 "Este mensaje está firmado con una firma válida, pero el remitente del "
 "mensaje no se pudo verificar."
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1607
 msgid "Signature exists, but need public key"
 msgstr "La firma existe pero se necesita la clave pública"
 
@@ -10849,7 +10808,7 @@ msgstr ""
 "Este mensaje está firmado con una firma pero no existe una clave pública "
 "correspondiente."
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1613
 msgid "Unencrypted"
 msgstr "Descifrado"
 
@@ -10861,7 +10820,7 @@ msgstr ""
 "Este mensaje no está cifrado. Su contenido puede verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1614
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
@@ -10875,7 +10834,7 @@ msgstr ""
 "ser difícil, pero no imposible para un espía ver el contenido de este "
 "mensaje empleando algo de tiempo."
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1615
 msgid "Encrypted"
 msgstr "Cifrado"
 
@@ -10887,7 +10846,7 @@ msgstr ""
 "Este mensaje está cifrado. Sería difícil para un espía ver el contenido de "
 "este mensaje."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1616
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
@@ -10901,15 +10860,15 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:240 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:248
+#: ../mail/em-format-html-display.c:253
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:497
+#: ../mail/em-format-html-display.c:508
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10917,28 +10876,28 @@ msgstr ""
 "Evolution no puede mostrar este correo debido a que es demasiado grande para "
 "procesarlo. Puede verlo sin formato o con un editor de texto externo."
 
-#: ../mail/em-format-html-display.c:725
+#: ../mail/em-format-html-display.c:751
 msgid "Completed on"
 msgstr "Completado en"
 
-#: ../mail/em-format-html-display.c:733
+#: ../mail/em-format-html-display.c:759
 msgid "Overdue:"
 msgstr "Atrasado:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:737
+#: ../mail/em-format-html-display.c:763
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:980 ../mail/em-format-html-display.c:1027
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:982
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1047
 msgid "O_pen With"
 msgstr "Abrir c_on"
 
@@ -10947,55 +10906,55 @@ msgstr "Abrir c_on"
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: ../mail/em-format-html.c:153
+#: ../mail/em-format-html.c:165
 msgid "Formatting message"
 msgstr "Formateando el mensaje"
 
-#: ../mail/em-format-html.c:352
+#: ../mail/em-format-html.c:362
 msgid "Formatting Message..."
 msgstr "Formateando el mensaje…"
 
-#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#: ../mail/em-format-html.c:1447 ../mail/em-format-html.c:1457
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Obteniendo «%s»"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1968
 msgid "Unknown external-body part."
 msgstr "Parte externa al cuerpo del mensaje desconocida."
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1976
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:2006
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:2017
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) válido en el sitio «%s»"
 
-#: ../mail/em-format-html.c:1952
+#: ../mail/em-format-html.c:2019
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:2040
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a datos remotos (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2051
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2647
+#: ../mail/em-format-html.c:2751
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "%s envió este mensaje en nombre de %s"
@@ -11006,50 +10965,95 @@ msgstr "%s envió este mensaje en nombre de %s"
 msgid "No HTML stream available"
 msgstr "No hay un flujo HTML disponible"
 
-#: ../mail/em-subscribe-editor.c:677
-msgid "This store does not support subscriptions, or they are not enabled."
-msgstr "Este almacén no soporta suscripciones, o no están activadas."
+#: ../mail/em-subscription-editor.c:1129
+msgid "Folder Subscriptions"
+msgstr "Suscripciones de carpetas"
 
-#: ../mail/em-subscribe-editor.c:728
-msgid "Subscribed"
-msgstr "Suscrito"
+#: ../mail/em-subscription-editor.c:1168
+msgid "_Account:"
+msgstr "_Cuenta:"
 
-#: ../mail/em-subscribe-editor.c:732
-msgid "Folder"
-msgstr "Carpeta"
+#: ../mail/em-subscription-editor.c:1183
+#| msgid "Clear the search"
+msgid "Clear Search"
+msgstr "Limpiar búsqueda"
 
-#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:1120
-msgid "Please select a server."
-msgstr "Seleccione un servidor."
+#: ../mail/em-subscription-editor.c:1201
+#| msgid "S_how only items containing:"
+msgid "Sho_w items that contain:"
+msgstr "Sólo _mostrar elementos que contengan:"
 
-#: ../mail/em-subscribe-editor.c:1166
-msgid "No server has been selected"
-msgstr "No se ha seleccionado ningún servidor"
+#: ../mail/em-subscription-editor.c:1238
+#| msgid "Unsubscribe from the selected folder"
+msgid "Subscribe to the selected folder"
+msgstr "Suscribirse a la carpeta seleccionada"
+
+#: ../mail/em-subscription-editor.c:1239
+#| msgid "Subscribed"
+msgid "Su_bscribe"
+msgstr "_Suscribirse"
+
+#: ../mail/em-subscription-editor.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
+msgid "Unsubscribe from the selected folder"
+msgstr "Desuscribirse de la carpeta seleccionada"
+
+#: ../mail/em-subscription-editor.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
+msgid "_Unsubscribe"
+msgstr "Des_uscribir"
+
+#: ../mail/em-subscription-editor.c:1262
+#| msgid "Collapse _all"
+msgid "Collapse all folders"
+msgstr "Contraer todas las carpetas"
+
+#: ../mail/em-subscription-editor.c:1263
+#| msgid "Collapse _all"
+msgid "C_ollapse All"
+msgstr "Contraer t_odas"
+
+#: ../mail/em-subscription-editor.c:1273
+#| msgid "E_xpand all"
+msgid "Expand all folders"
+msgstr "Expandir todas las carpetas"
+
+#: ../mail/em-subscription-editor.c:1274
+#| msgid "E_xpand all"
+msgid "E_xpand All"
+msgstr "E_xpandir todas"
+
+#: ../mail/em-subscription-editor.c:1284
+#| msgid "Refresh the folder"
+msgid "Refresh the folder list"
+msgstr "Actualizar la lista de carpetas"
+
+#: ../mail/em-subscription-editor.c:1296
+#| msgid "Cancel the current mail operation"
+msgid "Stop the current operation"
+msgstr "Detener la operación de correo"
 
 #. Translators: This message is shown only for ten or more
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:104
 #, c-format
-#| msgid "Are you sure you want to open %d messages at once?"
-#| msgid_plural "Are you sure you want to open %d messages at once?"
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "¿Está seguro de que quiere abrir %d mensaje a la vez?"
 msgstr[1] "¿Está seguro de que quiere abrir %d mensajes a la vez?"
 
-#: ../mail/em-utils.c:152
+#: ../mail/em-utils.c:150
 #: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "_No mostrar otra vez este mensaje."
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:312
 msgid "Message Filters"
 msgstr "Filtros de mensajes"
 
-#: ../mail/em-utils.c:848
+#: ../mail/em-utils.c:860
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensajes de %s"
@@ -11075,70 +11079,88 @@ msgid "\"Filter Editor\" window width"
 msgstr "Anchura de la ventana «Editor de filtros»"
 
 #: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
+#| msgid "\"Filter Editor\" window height"
+msgid "\"Folder Subscriptions\" window height"
+msgstr "Altura de la ventana «Editor de filtros»"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+#| msgid "\"Filter Editor\" window maximize state"
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "Estado maximizado de la ventana «Editor de filtros»"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+#, fuzzy
+#| msgid "\"Filter Editor\" window width"
+msgid "\"Folder Subscriptions\" window width"
+msgstr "Anchura de la ventana «Editor de filtros»"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Search Folder Editor\" window height"
 msgstr "Altura de la ventana «Editor de carpetas de búsqueda»"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Search Folder Editor\" window maximize state"
 msgstr "Estado maximizado de la ventana «Editor de filtros»"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Search Folder Editor\" window width"
 msgstr "Anchura de la ventana «Editor de carpetas de búsqueda»"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
 msgstr "Altura de la ventana «Enviar y recibir correo»"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "Estado maximizado de la ventana «Enviar y recibir correo»"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
 msgstr "Anchura de la ventana «Enviar y recibir correo»"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "Siempre solicitar confirmación de lectura"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Automatic emoticon recognition"
 msgstr "Reconocimiento automático de emoticonos"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Automatic link recognition"
 msgstr "Reconocimiento automático de enlaces"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Check incoming mail being junk"
 msgstr "Comprobar si el correo entrante es SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Citation highlight color"
 msgstr "Color de resaltado de citas"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Citation highlight color."
 msgstr "Color de resaltado de citas."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer Window default height"
 msgstr "Altura predeterminada de la ventana de redacción de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Composer Window default width"
 msgstr "Anchura predeterminada de la ventana de redacción de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Composer load/attach directory"
 msgstr "Directorio de carga/adjuntos del editor"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Comprimir la visualización de direcciones en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11146,7 +11168,7 @@ msgstr ""
 "Comprime la visualización de direcciones en A/CC/CCO al número especificado "
 "en address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11154,11 +11176,11 @@ msgstr ""
 "Controla la frecuencia con la que los cambios locales se sincronizan con el "
 "servidor de correo-e remoto. El intervalo debe ser de al menos 30 segundos."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Custom headers to use while checking for junk."
 msgstr "Cabeceras personalizadas que usar al comprobar si es SPAM."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11166,65 +11188,57 @@ msgstr ""
 "Cabeceras personalizadas que usar para comprobar si es SPAM. La lista de "
 "elementos son cadenas con el formato \"headername=valor\"."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default height of the mail browser window."
 msgstr "Altura predeterminada de la ventana del examinador de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default height of the subscribe dialog."
-msgstr "Altura predeterminada del diálogo de suscripción."
-
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default maximized state of the mail browser window."
 msgstr ""
 "Anchura predeterminada en estado maximizado de la ventana del examinador de "
 "correo."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default reply style"
 msgstr "Estilo de respuesta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para el estado de expansión de la conversación"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the Composer Window."
 msgstr "Anchura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the mail browser window."
 msgstr "Anchura predeterminada de la ventana del examinador de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default width of the subscribe dialog."
-msgstr "Anchura predeterminada del diálogo de suscripción."
-
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11232,13 +11246,13 @@ msgstr ""
 "Determina si se deben buscar direcciones para filtrar SPAM sólo en la "
 "libreta de direcciones local"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina si se debe buscar la dirección del remitente en la libreta de "
 "direcciones"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11250,12 +11264,12 @@ msgstr ""
 "libretas marcadas para autocompletado. Puede ser lento si se han marcado "
 "para autocompletado libretas de direcciones remotas (como LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11265,7 +11279,7 @@ msgstr ""
 "SPAM. Si esta opción está activada y las cabeceras se mencionan, se mejorará "
 "la velocidad de comprobado de correo basura."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11273,51 +11287,51 @@ msgstr ""
 "Determina si se debe usar la misma tipografía para las líneas «De» y «Asunto» "
 "en la columna «Mensajes» de la vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directorio para cargar/adjuntar archivos en el editor."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "Directorio para guardar archivos enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Desactivar o activar la elipsis de los nombres de las carpetas en la barra "
 "lateral"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Display only message texts not exceeding certain size"
 msgstr "Mostrar sólo los mensajes de texto que no excedan de cierto tamaño"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Do not add signature delimiter"
 msgstr "No añadir un delimitador de firma"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Dibujar indicadores de errores tipográficos en las palabras mientras se "
 "escribe."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Junk folders on exit"
 msgstr "Vaciar las carpetas SPAM al salir"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty Trash folders on exit"
 msgstr "Vaciar papeleras al salir"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vaciar todas las carpetas SPAM al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vaciar todas las papeleras al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -11325,31 +11339,31 @@ msgstr ""
 "Activar imágenes animadas en correos HTML. Muchos usuarios consideran "
 "molestas las imágenes animadas y prefieren ver una imagen estática."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Habilitar modo cursor, para que pueda ver un cursor cuando lee correo."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable magic space bar"
 msgstr "Activa o desactiva la barra espaciadora mágica"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activar o desactivar la pregunta cuando se marcan varios mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable or disable type ahead search feature"
 msgstr "Activa o desactiva la característica de búsqueda al teclear"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders"
 msgstr "Activar las carpetas de búsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable search folders on startup."
 msgstr "Activar las carpetas de búsqueda al inicio."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -11357,7 +11371,7 @@ msgstr ""
 "Activar la característica barra de búsqueda lateral para permitir búsquedas "
 "interactivas de nombres de carpetas."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -11365,7 +11379,7 @@ 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:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -11373,27 +11387,27 @@ msgstr ""
 "Activar el mostrado exclusivo de mensajes de texto que no excedan el tamaño "
 "definido en la clave «message_text_part_limit»."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Activar para usar una ajuste de vista de lista de mensajes similar para "
 "todas las carpetas"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Activar para usar una ajuste de vista de lista de mensajes similar para "
 "todas las carpetas."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+#: ../mail/evolution-mail.schemas.in.h:69 ../mail/mail-config.ui.h:42
 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:69
+#: ../mail/evolution-mail.schemas.in.h:70
 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, "
@@ -11405,27 +11419,27 @@ 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:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Flush Outbox after filtering"
 msgstr "Limpiar la bandeja de salida después de filtrar"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Group Reply replies to list"
 msgstr "Responder al grupo responde a la lista"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane"
 msgstr "Altura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Height of the message-list pane."
 msgstr "Altura del panel de vista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 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:75
+#: ../mail/evolution-mail.schemas.in.h:76
 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 +11447,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:76
+#: ../mail/evolution-mail.schemas.in.h:77
 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,11 +11458,11 @@ msgstr ""
 "visor de componentes bonobo en la base de datos de GNOME puede usarse para "
 "mostrar el contenido."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Ignore list Reply-To:"
 msgstr "Ignorar «Responder a:» para listas:"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -11456,7 +11470,19 @@ 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:79
+#: ../mail/evolution-mail.schemas.in.h:80
+#, fuzzy
+#| msgid ""
+#| "Initial height of the \"Filter Editor\" window. The value updates as the "
+#| "user resizes the window vertically."
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+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:81
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11464,7 +11490,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:80
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11472,7 +11498,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:81
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11484,7 +11510,25 @@ 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:82
+#: ../mail/evolution-mail.schemas.in.h:84
+#, fuzzy
+#| msgid ""
+#| "Initial maximize state of the \"Filter Editor\" window. The value updates "
+#| "when the user maximizes or unmaximizes the window. Note, this particular "
+#| "value is not used by Evolution since the \"Filter Editor\" window cannot "
+#| "be maximized. This key exists only as an implementation detail."
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"Estado inicial maximizado de la ventana «Editor de filtros». El valor se "
+"actualiza cuando el usuario maximiza o reduce la ventana. Nota: Evolution no "
+"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:85
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11497,7 +11541,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:83
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11511,7 +11555,7 @@ msgstr ""
 "no se puede maximizar. Esta clave existe sólo como un detalle de "
 "implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -11519,7 +11563,19 @@ 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:85
+#: ../mail/evolution-mail.schemas.in.h:88
+#, fuzzy
+#| msgid ""
+#| "Initial width of the \"Filter Editor\" window. The value updates as the "
+#| "user resizes the window horizontally."
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+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:89
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11527,7 +11583,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:86
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11535,7 +11591,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:87
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -11547,7 +11603,7 @@ msgstr ""
 "responder sólo a la lista de correo a través de la que recibe copias de los "
 "correos a los que está respondiendo."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:92
 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 "
@@ -11557,7 +11613,7 @@ msgstr ""
 "correos de una carpeta de búsqueda borra permanentemente el correo, no sólo "
 "los elimina de los resultados de la búsqueda."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -11566,7 +11622,7 @@ msgstr ""
 "que está enviando una respuesta privada a un correo que llegó a través de "
 "una lista de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -11574,7 +11630,7 @@ msgstr ""
 "Desactiva o activa los mensajes repetitivos para avisarle de que está "
 "enviando una respuesta a mucha gente."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -11585,35 +11641,35 @@ msgstr ""
 "una lista de correo, pero la lista establece una cabecera «Responder a:» que "
 "redirecciona su respuesta de nuevo a la lista."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Last time Empty Junk was run"
 msgstr "Última vez que se vació el SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Last time Empty Trash was run"
 msgstr "Última vez que se vació la papelera"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Layout style"
 msgstr "Estilo de la distribución"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:101
 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:98
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11622,16 +11678,16 @@ msgstr ""
 "lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:105
 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:102
+#: ../mail/evolution-mail.schemas.in.h:106
 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:103
+#: ../mail/evolution-mail.schemas.in.h:107
 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."
@@ -11640,15 +11696,15 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:108
 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:105
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Load images for HTML messages over HTTP"
 msgstr "Cargar imágenes para mensajes HTML sobre HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:110
 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 "
@@ -11659,186 +11715,199 @@ msgstr ""
 "remitente está en la libreta de direcciones; «2»: Siempre cargar imágenes "
 "desde la red."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:112
 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:109
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mail browser height"
 msgstr "Altura del examinador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mail browser maximized"
 msgstr "Examinador de correo maximizado"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mail browser width"
 msgstr "Anchura del examinador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto después del tiempo especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto después del tiempo especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuales en la vista previa del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la «vista previa» del mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Message text limit for display"
 msgstr "Límite del texto del mensaje para mostrarlo"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:123
 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:120
+#: ../mail/evolution-mail.schemas.in.h:124
 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:121
+#: ../mail/evolution-mail.schemas.in.h:125
 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:122
+#: ../mail/evolution-mail.schemas.in.h:126
 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:123
+#: ../mail/evolution-mail.schemas.in.h:127
 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:124
+#: ../mail/evolution-mail.schemas.in.h:128
 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:125
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid ""
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
+msgstr ""
+"Los valores posibles son: «never» (nunca) para no cerrar nunca la ventana del "
+"examinador; «always» (siempre) para cerrar siempre la ventana del examinador; "
+"«ask» (preguntar) o cualquier otro valor, preguntarán al usuario"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto está en blanco"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:131
 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:127
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un correo sin un asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar al eliminar correos en carpetas de búsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Preguntar cuando la lista de correo secuestre las respuestas privadas"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Prompt when replying or forwarding from a mail browser whether close it"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when replying privately to list messages"
 msgstr "Preguntar al responder de forma privada a correos de una lista"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when replying to many recipients"
 msgstr "Preguntar al responder a muchos desinatarios"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacte"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sólo rellene el campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:140
 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:135
+#: ../mail/evolution-mail.schemas.in.h:141
 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:136
+#: ../mail/evolution-mail.schemas.in.h:142
 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:137
+#: ../mail/evolution-mail.schemas.in.h:143
 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:138
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cuando se marquen varios correos"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:145
 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:140
+#: ../mail/evolution-mail.schemas.in.h:146
 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:141
+#: ../mail/evolution-mail.schemas.in.h:147
 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:142
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Run junk test on incoming mail."
 msgstr "Ejecutar la prueba de SPAM en el correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Save directory"
 msgstr "Directorio donde guardar"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:151
 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:146
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML de forma predeterminada"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Send HTML mail by default."
 msgstr "Enviar el correo en HTML de forma predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:154
 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:149
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronización con el servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11846,63 +11915,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:151
+#: ../mail/evolution-mail.schemas.in.h:157
 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:152
+#: ../mail/evolution-mail.schemas.in.h:158
 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:153
+#: ../mail/evolution-mail.schemas.in.h:159
 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:154
+#: ../mail/evolution-mail.schemas.in.h:160
 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:155
+#: ../mail/evolution-mail.schemas.in.h:161
 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:156
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show all message headers"
 msgstr "Mostrar todas las cabeceras del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostrar todas las cabeceras al ver mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show animated images as animations."
 msgstr "Mostrar las imágenes animadas como animaciones."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:166
 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:161
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar los mensajes borrados en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show image animations"
 msgstr "Mostrar imágenes animadas"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar el valor original de la cabecera «Fecha»."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show photo of the sender"
 msgstr "Mostrar la foto del remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11910,7 +11979,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:166
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11918,7 +11987,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:167
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11926,7 +11995,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:168
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11934,7 +12003,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:169
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11942,7 +12011,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:170
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -11950,7 +12019,7 @@ msgstr ""
 "Mostrar el correo-e del remitente en una columna separada en la lista de "
 "mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:177
 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 "
@@ -11961,11 +12030,11 @@ msgstr ""
 "cabecera «Fecha» en el formato preferido por el usuario para la fecha y hora "
 "locales."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:178
 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:173
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -11984,49 +12053,41 @@ msgstr ""
 "mismo. Funciona comparando la cabecera «Responder a:» con una cabecara «List-"
 "Post:», si existe."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en línea"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Spell checking color"
 msgstr "Color de la corrección ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Spell checking languages"
 msgstr "Comprobación ortográfica de idiomas"
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Subscribe dialog default height"
-msgstr "Altura predeterminada del diálogo de suscripción"
-
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Subscribe dialog default width"
-msgstr "Anchura predeterminada del diálogo de suscripción"
-
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Terminal font"
 msgstr "Tipografía del terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The default plugin for Junk hook"
 msgstr "El complemento predeterminado para SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:185
 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:182
+#: ../mail/evolution-mail.schemas.in.h:186
 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:183
+#: ../mail/evolution-mail.schemas.in.h:187
 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 "
@@ -12038,15 +12099,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:184
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "The terminal font for mail display."
 msgstr "La tipografía de terminal para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:189
 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:186
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -12054,7 +12115,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:187
+#: ../mail/evolution-mail.schemas.in.h:191
 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 "
@@ -12065,7 +12126,7 @@ msgstr ""
 "(4MiB). Este valor sólo se usa cuando la clave 'force_message_limit' está "
 "activada."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:192
 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 "
@@ -12075,7 +12136,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:189
+#: ../mail/evolution-mail.schemas.in.h:193
 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."
@@ -12084,7 +12145,7 @@ msgstr ""
 "Esto deselecciona el correo en la lista y elimina la vista previa para esa "
 "carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:194
 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;"
@@ -12096,7 +12157,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:191
+#: ../mail/evolution-mail.schemas.in.h:195
 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 "
@@ -12107,11 +12168,11 @@ msgstr ""
 "local para excluir de los filtros de correo basura el correo enviado por "
 "contactos conocidos."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:196
 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:193
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12119,7 +12180,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:194
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12128,7 +12189,7 @@ msgstr ""
 "deberían estar en estado expandido o contraído. Evolution necesita "
 "reiniciarse."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:199
 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 "
@@ -12138,53 +12199,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:196
+#: ../mail/evolution-mail.schemas.in.h:200
 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:197
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Timeout for marking message as seen"
 msgstr "Tiempo para marcar un mensaje como visto"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Timeout for marking message as seen."
 msgstr "Tiempo para marcar un mensaje como visto."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:204
 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:201
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar el demonio y cliente de SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usar el demonio y cliente de SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "Use custom fonts"
 msgstr "Usar tipografía personalizada"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipografía personalizada para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Use only local spam tests."
 msgstr "Usar sólo comprobaciones de SPAM locales."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:210
 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:207
+#: ../mail/evolution-mail.schemas.in.h:211
 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 "
@@ -12194,7 +12255,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:208
+#: ../mail/evolution-mail.schemas.in.h:212
 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 "
@@ -12204,23 +12265,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:209
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Variable width font"
 msgstr "Tipografía de anchura variable"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:214
 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:211
+#: ../mail/evolution-mail.schemas.in.h:215
 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:212
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12228,13 +12289,13 @@ 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:213
+#: ../mail/evolution-mail.schemas.in.h:217
 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:214
+#: ../mail/evolution-mail.schemas.in.h:218
 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 "
@@ -12245,11 +12306,11 @@ msgstr ""
 "algún filtro de acción «Reenviar a» y, aproximadamente, un minuto después de "
 "la última invocación a una acción."
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Width of the message-list pane"
 msgstr "Anchura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Width of the message-list pane."
 msgstr "Anchura del panel de lista de mensajes."
 
@@ -12258,7 +12319,7 @@ msgid "Importing Elm data"
 msgstr "Importando datos de Elm"
 
 #: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:964
+#: ../modules/mail/e-mail-shell-view.c:1027
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
@@ -12279,31 +12340,31 @@ msgstr "Carpeta de _destino:"
 
 #: ../mail/importers/evolution-mbox-importer.c:122
 #: ../plugins/dbx-import/dbx-importer.c:232
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
 #: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "Seleccione la carpeta en la que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:382
+#: ../mail/importers/evolution-mbox-importer.c:381
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../mail/importers/evolution-mbox-importer.c:387
+#: ../mail/importers/evolution-mbox-importer.c:386
 msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
 
-#: ../mail/importers/evolution-mbox-importer.c:431
+#: ../mail/importers/evolution-mbox-importer.c:430
 #: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Buzón Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:432
+#: ../mail/importers/evolution-mbox-importer.c:431
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de carpetas en formato buzón de Berkeley"
 
@@ -12312,15 +12373,15 @@ msgid "Importing mailbox"
 msgstr "Importando buzón de correo"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
+#: ../mail/importers/mail-importer.c:146
 #: ../plugins/dbx-import/dbx-importer.c:554
-#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:449
 #: ../plugins/pst-import/pst-importer.c:558
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importando «%s»"
 
-#: ../mail/importers/mail-importer.c:295
+#: ../mail/importers/mail-importer.c:289
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizando %s"
@@ -12388,492 +12449,453 @@ msgstr[1] ""
 "«%s» debiado a la carpeta eliminada\n"
 "«%s»."
 
-#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
-#: ../mail/mail-config.ui.h:2
-msgid "(Not Recommended)"
-msgstr "(No recomendado)"
-
-#: ../mail/mail-config.ui.h:3
-msgid "(Note: Requires restart of the application)"
-msgstr "(Nota: Requiere reiniciar la aplicación)"
-
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Información de la cuenta"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "Añadir firma _nueva…"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:3
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
 
-#: ../mail/mail-config.ui.h:8
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:5
+#, fuzzy
+#| msgid "Prompt when mailing list redirects private reply back to list"
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr ""
+"Preguntar cuando una lista de correo redirija las respuestas privadas de "
+"nuevo a la lista"
+
+#: ../mail/mail-config.ui.h:6
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "También cifrar a _mí mismo cuando envíe correo cifrado"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:7
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Siempre enviar _copia de carbón (Cc) a:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:8
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Siempre enviar copia de carbón _oculta (Cco) a:"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:9
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Siempre _confiar en las claves de mi almacén al cifrar"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:10
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Siempre cifrar a _mí mismo cuando envíe correo cifrado"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "Siempre _solicitar confirmación de lectura"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:12
 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
+#: ../mail/mail-config.ui.h:14
 #: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "Insertar imágenes de _emoticonos automáticamente"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "Conjunto de carac_teres:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "C_omprobar tipos soportados"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "Compro_bar las cabeceras personalizadas contra SPAM"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar si los _mensajes entrantes son basura"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "Comprobar orto_grafía mientras se escribe"
 
-#: ../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:24
+#: ../mail/mail-config.ui.h:21
 msgid "Cle_ar"
 msgstr "_Vaciar"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:22
 msgid "Clea_r"
 msgstr "Vacia_r"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:23
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras _mal escritas:"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:24
 msgid "Composing Messages"
 msgstr "Redactar mensajes"
 
-#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:25
+#: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "Configuración"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:26
 msgid "Confirm _when expunging a folder"
 msgstr "_Confirmar antes de purgar una carpeta"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:27
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirmations"
+msgstr "Configuración"
+
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "Comportamiento predeterminado"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "_Codificación de caracteres predeterminada:"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:32
 msgid "Delete Mail"
 msgstr "Eliminar correo-e"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar los mensajes SPAM al _salir"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Firmar digitalmente los mensajes s_alientes (por omisión)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:36
 msgid "Displayed Message Headers"
 msgstr "Cabeceras mostradas del mensaje"
 
-#: ../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:41
+#: ../mail/mail-config.ui.h:37
 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:42
+#: ../mail/mail-config.ui.h:38
 msgid "Do not quote"
 msgstr "No entrecomillar"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:39
 msgid "Drafts _Folder:"
 msgstr "Carpeta de _borradores:"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:40
 msgid "Email _Address:"
 msgstr "Dir_ección de correo-e:"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:41
 msgid "Empty trash folders on e_xit"
 msgstr "Vaciar _papelera al salir"
 
-#: ../mail/mail-config.ui.h:46
-msgid "Enable Magic S_pacebar"
-msgstr "Activar la barra e_spaciadora mágica"
-
-#: ../mail/mail-config.ui.h:47
-msgid "Enable Sea_rch Folders"
-msgstr "Activar las Carpetas de _búsqueda"
-
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:43
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_frado:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:44
 msgid "Encrypt out_going messages (by default)"
 msgstr "Cifrar mensajes _salientes (por omisión)"
 
-#: ../mail/mail-config.ui.h:51
-msgid "Fi_xed-width:"
-msgstr "Anchura _fija:"
+#: ../mail/mail-config.ui.h:45
+msgid "F_all back to threading messages by subject"
+msgstr "Agrupar los mensajes por _asunto"
 
-#: ../mail/mail-config.ui.h:52
-msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:46
+#, fuzzy
+#| msgid "Fix_ed width Font:"
+msgid "Fix_ed Width Font:"
 msgstr "Tipografía de anchura _fija:"
 
-#: ../mail/mail-config.ui.h:53
-msgid "Font Properties"
-msgstr "Propiedades de tipografías"
-
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:47
 msgid "Format messages in _HTML"
 msgstr "Dar formato _HTML a los mensajes"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:48
 msgid "Full Nam_e:"
 msgstr "Nombre co_mpleto:"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:50
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "Responder al grupo sólo envía a la lista de correo, si es posible"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:51
 msgid "HTML Messages"
 msgstr "Mensajes HTML"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:52
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:53
 msgid "Headers"
 msgstr "Cabeceras"
 
 # Esta cadena debe permanecer así
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:54
 msgid "Highlight _quotations with"
 msgstr "Resaltar texto _citado con este color:"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:55
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "Ignorar «Responder a:» para listas de correo"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:56
 msgid "Inline"
 msgstr "En línea"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:57
 msgid "Inline (Outlook style)"
 msgstr "En línea (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:67
-msgid "KB"
-msgstr "Kib"
-
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:59 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:60
 msgid "Languages Table"
 msgstr "Tabla de idiomas"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:61
 msgid "Loading Images"
 msgstr "Cargando imágenes"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:62
 msgid "Mail Headers Table"
 msgstr "Tabla de cabeceras de correo"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:63
 msgid "Mailbox location"
 msgstr "Dirección del buzón"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:64
 msgid "Message Display"
 msgstr "Mostrado de mensajes"
 
-#: ../mail/mail-config.ui.h:74
-msgid "Message Fonts"
-msgstr "Tipografías del mensaje"
-
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:65
 msgid "Message Receipts"
 msgstr "Destinatarios del mensaje"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:66
 msgid "No _Proxy for:"
 msgstr "Sin _proxy para:"
 
-#: ../mail/mail-config.ui.h:78
-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:79
+#: ../mail/mail-config.ui.h:68
 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:80
+#: ../mail/mail-config.ui.h:69
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Información opcional"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:71
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:72
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:73
 msgid "Pass_word:"
 msgstr "_Contraseña:"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:75
 msgid "Port:"
 msgstr "Puerto:"
 
-#: ../mail/mail-config.ui.h:87
-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:88
+#: ../mail/mail-config.ui.h:76
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:90
-msgid "Printed Fonts"
-msgstr "Tipografías imprimidas"
-
-#: ../mail/mail-config.ui.h:91
-msgid "Prompt when mailing list redirects private reply back to list"
-msgstr ""
-"Preguntar cuando una lista de correo redirija las respuestas privadas de "
-"nuevo a la lista"
-
-#: ../mail/mail-config.ui.h:92
-msgid "Prompt when sending private replies to mailing _list messages"
-msgstr ""
-"Preguntar al enviar respuestas privadas a mensajes de _listas de correo"
-
-#: ../mail/mail-config.ui.h:93
-msgid "Prompt when sending replies to _many recipients"
-msgstr "Preguntar al enviar mensajes con _muchos destinatarios"
-
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:78
 msgid "Proxy Settings"
 msgstr "Ajustes del proxy"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:79
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:80
 msgid "Re_member password"
 msgstr "_Recordar contraseña"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:81
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:82
 msgid "Remember _password"
 msgstr "Recordar contrase_ña"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:83
+#, fuzzy
+#| msgid "Replies and parents"
+msgid "Replies and Forwards"
+msgstr "Respuestas y antecesores"
+
+#: ../mail/mail-config.ui.h:84
 msgid "Required Information"
 msgstr "Información requerida"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:85
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:86
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:87
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:88
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:90
 msgid "SSL is not supported in this build of Evolution"
 msgstr "Esta compilación de Evolution no soporta SSL"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:91
 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:108
+#: ../mail/mail-config.ui.h:92
 msgid "S_elect..."
 msgstr "S_eleccionar…"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:93
 msgid "S_end message receipts:"
 msgstr "_Enviar confirmaciones de mensajes:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:94
 msgid "S_tandard Font:"
 msgstr "Tipografía _estándar:"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:95
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/mail-config.ui.h:113
-msgid "Select Drafts Folder"
-msgstr "Seleccionar la carpeta de borradores"
-
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:97
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: ../mail/mail-config.ui.h:115
-msgid "Select HTML fixed width font for printing"
-msgstr "Selecciona letra de anchura fija en HTML para imprimir"
-
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:98
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: ../mail/mail-config.ui.h:117
-msgid "Select HTML variable width font for printing"
-msgstr "Selecciona letra de anchura variable en HTML para imprimir"
-
-#: ../mail/mail-config.ui.h:118
-msgid "Select Junk Folder"
-msgstr "Seleccionar carpeta de SPAM"
+#: ../mail/mail-config.ui.h:99
+msgid "Sender Photograph"
+msgstr "Foto del remitente"
 
-#: ../mail/mail-config.ui.h:119
-msgid "Select Sent Folder"
-msgstr "Seleccionar la carpeta de enviados"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:101
+#, fuzzy
+#| msgid "Prompt when sending private replies to mailing _list messages"
+msgid "Sending a _private reply to a mailing list message"
+msgstr ""
+"Preguntar al enviar respuestas privadas a mensajes de _listas de correo"
 
-#: ../mail/mail-config.ui.h:120
-msgid "Select Trash Folder"
-msgstr "Seleccionar la carpeta de papelera"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:103
+#, fuzzy
+#| msgid "_Prompt when sending messages with an empty subject line"
+msgid "Sending a message with an _empty subject line"
+msgstr "Pr_eguntar al enviar mensajes con el asunto vacío"
 
-#: ../mail/mail-config.ui.h:121
-msgid "Sender Photograph"
-msgstr "Foto del remitente"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:105
+#, fuzzy
+#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Preguntar al enviar mensajes que tan sólo tengan definido el _Cco"
 
-#: ../mail/mail-config.ui.h:122
-msgid "Sending Mail"
-msgstr "Envío de correo"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+#| msgid "Send reply to all recipients?"
+msgid "Sending a reply to a large _number of recipients"
+msgstr "¿Enviar respuesta a todos los destinatarios?"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:108
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: ../mail/mail-config.ui.h:124
-msgid "Sent and Draft Messages"
-msgstr "Mensajes enviados y borradores"
-
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:109
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:110
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:111
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:112
 msgid "Si_gning algorithm:"
 msgstr "Algoritmo de _firma:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:113
 msgid "Sig_natures"
 msgstr "_Firmas"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:114
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _firma:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:115
 msgid "Signat_ure:"
 msgstr "_Firma:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:116
 msgid "Signatures"
 msgstr "Firmas"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:117
 msgid "Signing _algorithm:"
 msgstr "_Algoritmo de firma:"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:118
+#, fuzzy
+#| msgid "Local Folders"
+msgid "Special Folders"
+msgstr "Carpetas locales"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "Comenzar a _escribir en la parte final al responder"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12881,7 +12903,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:139
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12891,12 +12913,15 @@ msgstr ""
 "El nombre que especifique se usará únicamente \n"
 "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:143
-msgid "Top Posting Option"
-msgstr "Opción de publicar por encima"
+#: ../mail/mail-config.ui.h:127
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr ""
+"Para evitar accidentes y situaciones embarazosas con el correo-e, pedir "
+"confirmación antes de realizar las siguientes acciones marcadas:"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12904,168 +12929,148 @@ msgstr ""
 "Teclee el nombre por el que quiere identificar a esta cuenta.\n"
 "Por ejemplo: «Trabajo» o «Personal»"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:130
 msgid "Us_ername:"
 msgstr "_Usuario:"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:131
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../mail/mail-config.ui.h:148 ../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:149
-msgid "V_ariable-width:"
-msgstr "An_chura variable:"
+#: ../mail/mail-config.ui.h:132
+#| msgid "User_name:"
+msgid "User _Name:"
+msgstr "_Nombre de usuario:"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "_Añadir firma"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "_Siempre cargar las imágenes desde Internet"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "Complemento SPAM pre_determinado:"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "Conexión _directa a Internet"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:138
 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:156
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:140
 msgid "_Junk Folder:"
 msgstr "Carpeta de _SPAM:"
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:141
+#, fuzzy
+#| msgid "_Keep Signature above the original message on replying"
+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:159
+#: ../mail/mail-config.ui.h:142
 msgid "_Languages"
 msgstr "_Idiomas"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Load images in messages from contacts"
-msgstr "_Cargar imágenes en los mensajes de mis contactos"
+#: ../mail/mail-config.ui.h:143
+#| msgid "_Load images in messages from contacts"
+msgid "_Load images only in messages from contacts"
+msgstr "Cargar i_mágenes en los mensajes de mis contactos"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:144
 msgid "_Lookup in local address book only"
 msgstr "_Buscar sólo en la libreta de direcciones local"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:145
 msgid "_Make this my default account"
 msgstr "_Hacer que ésta sea mi cuenta predeterminada"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:146
 msgid "_Manual proxy configuration:"
 msgstr "Configuración _manual del proxy:"
 
-#: ../mail/mail-config.ui.h:164
-msgid "_Mark messages as read after"
-msgstr "_Marcar mensajes como leídos tras"
-
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar imágenes desde Internet"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:150
 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:169
-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:170
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:155 ../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:176
-msgid "_Show image animations"
-msgstr "_Mostrar animaciones"
+#: ../mail/mail-config.ui.h:157
+#| msgid "Show animated images as animations."
+msgid "_Show animated images"
+msgstr "_Mostrar las imágenes animadas"
 
-#: ../mail/mail-config.ui.h:177
+#: ../mail/mail-config.ui.h:158
 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:179
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Reducir las cabeceras Para / Cc / Cco a "
-
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:159
 msgid "_Trash Folder:"
 msgstr "Carpeta de p_apelera:"
 
-#: ../mail/mail-config.ui.h:181
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "Usar cone_xión segura:"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "_Usar los valores predeterminados del sistema"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
 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:186
-msgid "addresses"
-msgstr "direcciones"
-
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:164 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "por"
 
 # Esta traducción debe mantenerse así
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:165
 msgid "color"
 msgstr "color"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:166
 msgid "description"
 msgstr "descripción"
 
@@ -13090,78 +13095,58 @@ msgid "Co_mpleted"
 msgstr "_Terminado"
 
 #: ../mail/mail-dialogs.ui.h:6
-msgid "Collapse _all"
-msgstr "Contraer t_odas"
-
-#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Firma digital"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "No reenviar"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "E_xpand all"
-msgstr "E_xpandir todas"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Folder Subscriptions"
-msgstr "Suscripciones de carpetas"
-
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "Seguimiento"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "Para su información"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:12
 msgid "License Agreement"
 msgstr "Acuerdo de licencia"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "Revisar"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "S_erver:"
-msgstr "S_ervidor:"
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid "S_how only items containing:"
-msgstr "Sólo _mostrar elementos que contengan:"
-
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Search Folder Sources"
 msgstr "Orígenes de las carpetas de búsqueda"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Security Information"
 msgstr "Información de seguridad"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Specific folders"
 msgstr "Carpetas específicas"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13169,23 +13154,23 @@ msgstr ""
 "Los mensajes que ha seleccionado para seguir se listan abajo.\n"
 "Seleccione una acción de seguimiento desde el menú «Marcar»."
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:24
 msgid "_Accept License"
 msgstr "_Aceptar licencia"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Due By:"
 msgstr "_Vence el:"
 
-#: ../mail/mail-dialogs.ui.h:31
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.ui.h:32
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque esto para aceptar el acuerdo de licencia"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:791
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
@@ -13194,16 +13179,16 @@ msgstr "Haciendo ping a %s"
 msgid "Filtering Selected Messages"
 msgstr "Filtrado de mensajes seleccionados"
 
-#: ../mail/mail-ops.c:245
+#: ../mail/mail-ops.c:229
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: ../mail/mail-ops.c:592
+#: ../mail/mail-ops.c:586
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No se pudieron aplicar los filtros al correo saliente: %s"
 
-#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
+#: ../mail/mail-ops.c:602 ../mail/mail-ops.c:633
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13212,163 +13197,146 @@ msgstr ""
 "Falló al anexar a %s: %s\n"
 "En su lugar se anexará a la carpeta local «Correo enviado»."
 
-#: ../mail/mail-ops.c:654
+#: ../mail/mail-ops.c:653
 #, 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:774 ../mail/mail-ops.c:866
+#: ../mail/mail-ops.c:769 ../mail/mail-ops.c:862
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:780
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:827
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Falló al enviar %d de %d mensajes"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:783
+#: ../mail/mail-ops.c:829 ../mail/mail-send-recv.c:782
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:785
+#: ../mail/mail-ops.c:831 ../mail/mail-send-recv.c:784
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:938
+#: ../mail/mail-ops.c:936
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Guardando mensaje en la carpeta «%s»"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1021
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Moviendo mensajes a «%s»"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1021
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando mensajes a «%s»"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1137
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Analizando carpetas en «%s»"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1249
 msgid "Forwarded messages"
 msgstr "Mensajes reenviados"
 
-#: ../mail/mail-ops.c:1276
+#: ../mail/mail-ops.c:1290
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Abriendo carpeta «%s»"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1357
 #, 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:1414
+#: ../mail/mail-ops.c:1429
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Abriendo almacén «%s»"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1502
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Eliminando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1639
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1703
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1760
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1798
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Compactando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1844
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1845
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2060
 #, 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:2105
+#: ../mail/mail-ops.c:2152
 #, 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:2192
+#: ../mail/mail-ops.c:2248
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "Error al guardar los mensajes en: %s:\n"
 
-#: ../mail/mail-ops.c:2265
-msgid "Saving attachment"
-msgstr "Guardando adjunto"
-
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"No es posible crear el archivo de salida: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2310
-msgid "Could not write data: "
-msgstr "No se pudieron escribir los datos: "
-
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2400
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Desconectando de «%s»"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2400
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Reconectándose con «%s»"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2494
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando la cuenta «%s» para desconexión"
 
-#: ../mail/mail-ops.c:2636
+#: ../mail/mail-ops.c:2582
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
@@ -13376,19 +13344,19 @@ msgstr "Comprobando el servicio"
 msgid "Canceling..."
 msgstr "Cancelando…"
 
-#: ../mail/mail-send-recv.c:440
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: ../mail/mail-send-recv.c:457
+#: ../mail/mail-send-recv.c:448
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:564
 msgid "Updating..."
 msgstr "Actualizando…"
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
+#: ../mail/mail-send-recv.c:564 ../mail/mail-send-recv.c:648
 msgid "Waiting..."
 msgstr "Esperando…"
 
@@ -13397,30 +13365,30 @@ msgstr "Esperando…"
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:218
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduzca la contraseña para %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:220
 msgid "Enter Passphrase"
 msgstr "Introduzca la contraseña"
 
-#: ../mail/mail-session.c:230
+#: ../mail/mail-session.c:223
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: ../mail/mail-session.c:232
+#: ../mail/mail-session.c:225
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../mail/mail-session.c:277
+#: ../mail/mail-session.c:270
 #, c-format
 msgid "User canceled operation."
 msgstr "El usuario canceló la operación."
 
-#: ../mail/mail-session.c:724
+#: ../mail/mail-session.c:704
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
@@ -13428,32 +13396,32 @@ msgstr ""
 "No se proporcionó ninguna dirección de destino, se canceló el reenvío del "
 "mensaje."
 
-#: ../mail/mail-session.c:733
+#: ../mail/mail-session.c:713
 #, c-format
 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."
 
-#: ../mail/mail-tools.c:128
+#: ../mail/mail-tools.c:132
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "No se pudo crear el directorio spool «%s»: %s"
 
-#: ../mail/mail-tools.c:161
+#: ../mail/mail-tools.c:165
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Intentando mover correo desde un origen que no es un buzón «%s»"
 
-#: ../mail/mail-tools.c:273
+#: ../mail/mail-tools.c:277
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaje reenviado: %s"
 
-#: ../mail/mail-tools.c:275
+#: ../mail/mail-tools.c:279
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: ../mail/mail-tools.c:318
+#: ../mail/mail-tools.c:325
 #, c-format
 msgid "Invalid folder: '%s'"
 msgstr "Carpeta no válida: «%s»"
@@ -13463,12 +13431,12 @@ msgstr "Carpeta no válida: «%s»"
 msgid "Setting up Search Folder: %s"
 msgstr "Configurando carpeta de búsqueda: %s"
 
-#: ../mail/mail-vfolder.c:224
+#: ../mail/mail-vfolder.c:225
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Actualizando carpetas de búsqueda para «%s: %s»"
 
-#: ../mail/mail-vfolder.c:231
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando carpetas de búsqueda para «%s»"
@@ -13478,7 +13446,7 @@ msgstr "Actualizando carpetas de búsqueda para «%s»"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:675
+#: ../mail/mail-vfolder.c:678
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -13496,11 +13464,11 @@ msgstr[1] ""
 "«%s» se han modificado para dar cuenta de la carpeta eliminada\n"
 "«%s»."
 
-#: ../mail/mail-vfolder.c:1185
+#: ../mail/mail-vfolder.c:1198
 msgid "Edit Search Folder"
 msgstr "Editar carpeta de búsqueda"
 
-#: ../mail/mail-vfolder.c:1290
+#: ../mail/mail-vfolder.c:1303
 msgid "New Search Folder"
 msgstr "Carpeta de búsqueda nueva"
 
@@ -13704,72 +13672,77 @@ msgstr ""
 "puede estar activada."
 
 #: ../mail/mail.error.xml.h:43
+#| msgid "Close this window"
+msgid "Close message window."
+msgstr "Cerrar la ventana de mensaje."
+
+#: ../mail/mail.error.xml.h:44
 msgid "Could not save signature file."
 msgstr "No es posible guardar el archivo de firma."
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "¿Eliminar los mensajes en la carpeta de búsqueda «{0}»?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Disable"
 msgstr "_No desactivar"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Send"
 msgstr "_No enviar"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do _Not Synchronize"
 msgstr "_No sincronizar"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr ""
 "¿Quiere sincronizar localmente las carpetas marcadas para uso en desconexión?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "¿Quiere marcar todos los mensajes como leídos?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "¿Desea guardar los cambios?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "Introduzca la contraseña."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "Error al cargar las definiciones de filtros."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "Error al efectuar operación."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "Error while {0}."
 msgstr "Error mientras estaba {0}."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but cannot overwrite it."
 msgstr "El archivo existe pero no se puede sobreescribir."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid "File exists but is not a regular file."
 msgstr "El archivo existe pero no es un archivo regular."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continua, no podrá recuperar estos mensajes."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -13777,16 +13750,16 @@ msgstr ""
 "Si elimina la carpeta, todo su contenido y el de sus subcarpetas se "
 "eliminará permanentemente."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Si borra la carpeta, se eliminará permanentemente todo su contenido."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Si continúa, las cuentas proxy se eliminarán permanentemente."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13794,11 +13767,11 @@ msgstr ""
 "Si continúa, la información de la cuenta y toda la\n"
 "información del proxy se eliminará permanentemente."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continúa, la información de la cuenta se eliminará permanentemente."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13806,23 +13779,23 @@ msgstr ""
 "Si sale, estos mensajes no se enviarán hasta que Evolution sea iniciado de "
 "nuevo."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Invalid authentication"
 msgstr "Autenticación inválida"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "Mail Deletion Failed"
 msgstr "Ha fallado el borrado del correo"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automáticamente."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13834,27 +13807,32 @@ msgstr ""
 "listará todos los destinatarios de su mensaje de todas formas. Para evitar "
 "esto debería añadir al menos un destinatario «Para:» o «CC:»."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Falta la carpeta."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
+#| msgid "Never"
+msgid "N_ever"
+msgstr "_Nunca"
+
+#: ../mail/mail.error.xml.h:78
 msgid "No sources selected."
 msgstr "No se ha seleccionado ningún origen."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiados mensajes a la vez puede llevar mucho tiempo."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 msgid "Please check your account settings and try again."
 msgstr "Compruebe su configuración de la cuenta e inténtelo otra vez."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid "Please enable the account or send using another account."
 msgstr "Active la cuenta o envíe usando otra cuenta."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13863,7 +13841,7 @@ msgstr ""
 "direcciones de correo pulsando en el botón «Para:» al lado de la caja de "
 "entrada."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13873,61 +13851,61 @@ msgstr ""
 "recibir correo-e en HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduzca un nombre único para identificar esta firma."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Please wait."
 msgstr "Por favor espere."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problema al migrar la carpeta antigua de correo «{0}»."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Se está consultando al servidor por una lista de mecanismos de autenticación "
 "soportados."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Read receipt requested."
 msgstr "Se solicitó una notificación de lectura."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:90
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "¿Seguro que quiere eliminar la carpeta «{0}» y todas sus subcarpetas?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:91
 msgid "Really delete folder \"{0}\"?"
 msgstr "¿Realmente quiere borrar la carpeta «{0}»?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:92
 msgid "Reply _Privately"
 msgstr "Responder pri_vadamente"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:95
 msgid "Search Folders automatically updated."
 msgstr "Carpetas de búsqueda autoactualizadas."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:96
 msgid "Send private reply?"
 msgstr "¿Enviar una respuesta privada?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:97
 msgid "Send reply to all recipients?"
 msgstr "¿Enviar respuesta a todos los destinatarios?"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:98
 msgid "Signature Already Exists"
 msgstr "La firma ya existe"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:99
 msgid "Synchronize folders locally for offline usage?"
 msgstr "¿Sincronizar las carpetas localmente para usarse sin conexión?"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13935,7 +13913,7 @@ msgstr ""
 "Evolution requiere las carpetas de sistema para funcionar correctamente y no "
 "pueden renombrarse, moverse o eliminarse."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13951,7 +13929,7 @@ msgstr ""
 "destinatarios en su mensaje. Para evitar esto, debería añadir al menos un "
 "destinatario a Para: o Cc: "
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13959,7 +13937,7 @@ msgstr ""
 "No se reconoció el siguiente destinatario como dirección de correo válida:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13968,11 +13946,11 @@ msgstr ""
 "válidas:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:108
 msgid "The script file must exist and be executable."
 msgstr "El archivo de script debe existir y ser ejecutable."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13981,7 +13959,7 @@ msgstr ""
 "vaya al editor de carpetas de búsqueda para añadirla explícitamente, si es "
 "necesario."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13989,13 +13967,13 @@ msgstr ""
 "El mensaje no puede enviarse porque la cuenta con la que eligió enviar no "
 "está activada"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Este mensaje no puede enviarse porque no ha especificado ningún destinatario"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14003,11 +13981,11 @@ msgstr ""
 "Este servidor no soporta este tipo de autenticación requerido y quizá no "
 "soporte ningún tipo de autenticación."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:114
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta firma ha cambiado, pero no ha sido guardada."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14015,16 +13993,16 @@ msgstr ""
 "Esto marcará todos los mensajes como leídos en la carpeta seleccionada y sus "
 "subcarpetas."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
 msgid "This will mark all messages as read in the selected folder."
 msgstr ""
 "Esto marcará todos los mensajes como leídos en la carpeta seleccionada."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to connect to the GroupWise server."
 msgstr "No es posible conectarse con el servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14032,19 +14010,19 @@ msgstr ""
 "No es posible abrir la carpeta de borradores para esta cuenta. ¿Quiere usar "
 "la carpeta de borradores del sistema?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to read license file."
 msgstr "No es posible leer el archivo de licencia."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid "Use _Default"
 msgstr "Usar _predeterminada"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "Use default drafts folder?"
 msgstr "¿Desea usar la carpeta de borradores predeterminada?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -14054,7 +14032,13 @@ msgstr ""
 "e actual de una de sus carpetas locales o remotas.\n"
 "¿Quiere borrar estos mensajes?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
+#, fuzzy
+#| msgid "Would you like to accept it?"
+msgid "Would you like to close the message window?"
+msgstr "¿Quiere aceptarlo?"
+
+#: ../mail/mail.error.xml.h:125
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -14064,7 +14048,7 @@ msgstr ""
 "lista de correo, pero la lista está intentando redireccionar su respuesta de "
 "nuevo a la lista. ¿Está seguro de que quiere proceder?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -14074,7 +14058,7 @@ msgstr ""
 "pero está respondiendo de forma privada al remitente, no a la lista. ¿Está "
 "seguro de que quiere proceder?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -14082,31 +14066,31 @@ msgstr ""
 "Está respondiendo a un correo-e que se envió a muchos destinatarios. ¿Está "
 "seguro de que quiere responder a TODOS ellos?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "No tiene suficientes permisos para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nombre a esta carpeta de búsqueda."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:133
 msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14116,121 +14100,139 @@ msgstr ""
 "Hágalo seleccionando las carpetas individualmente, y/o seleccionando todas "
 "las carpetas locales, todas las carpetas remotas, o ambas."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Su inicio de sesión en su servidor «{0}» como «{0}» falló."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
+#, fuzzy
+#| msgid "Always"
+msgid "_Always"
+msgstr "Siempre"
+
+#: ../mail/mail.error.xml.h:138
 msgid "_Append"
 msgstr "_Agregar"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:139
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
 #: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:140
 msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
-#: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../mail/mail.error.xml.h:141
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:142
 msgid "_Expunge"
 msgstr "_Purgar"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:143
+#, fuzzy
+#| msgid "No"
+msgid "_No"
+msgstr "No"
+
+#: ../mail/mail.error.xml.h:144
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:147
 msgid "_Send Receipt"
 msgstr "_Enviar confirmación"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:148
 msgid "_Synchronize"
 msgstr "_Sincronizar"
 
-#: ../mail/message-list.c:1170
+#: ../mail/mail.error.xml.h:149
+#, fuzzy
+#| msgid "Yes"
+msgid "_Yes"
+msgstr "Sí"
+
+#: ../mail/message-list.c:1175
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1171
+#: ../mail/message-list.c:1176
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1172
+#: ../mail/message-list.c:1177
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1178
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1179
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1180
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1184
 msgid "Lowest"
 msgstr "La más baja"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1185
 msgid "Lower"
 msgstr "Más baja"
 
-#: ../mail/message-list.c:1184
+#: ../mail/message-list.c:1189
 msgid "Higher"
 msgstr "Más alta"
 
-#: ../mail/message-list.c:1185
+#: ../mail/message-list.c:1190
 msgid "Highest"
 msgstr "La más alta"
 
-#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1800 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1807 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1811
+#: ../mail/message-list.c:1816
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1823
+#: ../mail/message-list.c:1828
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1831
+#: ../mail/message-list.c:1836
 msgid "%b %d %l:%M %p"
 msgstr "%e de %b %l:%M %p"
 
-#: ../mail/message-list.c:1833
+#: ../mail/message-list.c:1838
 msgid "%b %d %Y"
 msgstr "%e de %b de %Y"
 
-#: ../mail/message-list.c:2598
+#: ../mail/message-list.c:2590
 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:4412 ../mail/message-list.c:4820
+#: ../mail/message-list.c:4397 ../mail/message-list.c:4806
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: ../mail/message-list.c:4643
+#: ../mail/message-list.c:4628
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14238,7 +14240,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:4645
+#: ../mail/message-list.c:4630
 msgid "There are no messages in this folder."
 msgstr "No hay mensajes en esta carpeta."
 
@@ -14276,27 +14278,27 @@ msgid "Subject - Trimmed"
 msgstr "Asunto recortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Body contains"
 msgstr "El cuerpo contiene"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Message contains"
 msgstr "El mensaje contiene"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Recipients contain"
 msgstr "El destinatario contiene"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Sender contains"
 msgstr "El remitente contiene"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "Subject contains"
 msgstr "El asunto contiene"
 
@@ -14486,7 +14488,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:162
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/mail/em-mailer-prefs.c:1061
 msgid "_Table column:"
 msgstr "Columna de _tabla:"
 
@@ -14592,7 +14594,7 @@ msgstr "Mostrar las propiedades de la libreta de direcciones seleccionada"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1354
 #: ../modules/calendar/e-memo-shell-view-actions.c:620
 #: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "_Rename..."
 msgstr "_Renombrar…"
 
@@ -14682,7 +14684,7 @@ msgstr "A_cciones"
 #: ../modules/addressbook/e-book-shell-view-actions.c:808
 #: ../modules/calendar/e-memo-shell-view-actions.c:657
 #: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
 msgid "_Preview"
 msgstr "Vista _previa"
 
@@ -14714,7 +14716,7 @@ msgstr "Mostrar una ventana de vista previa de contactos"
 #: ../modules/addressbook/e-book-shell-view-actions.c:879
 #: ../modules/calendar/e-memo-shell-view-actions.c:727
 #: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "_Classic View"
 msgstr "Vista _clásica"
 
@@ -14725,7 +14727,7 @@ msgstr "Mostrar la vista previa del contacto bajo la lista de mensajes"
 #: ../modules/addressbook/e-book-shell-view-actions.c:886
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1195
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "_Vertical View"
 msgstr "Vista _vertical"
 
@@ -14751,7 +14753,7 @@ msgstr "No coincidente"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1680
 #: ../modules/calendar/e-memo-shell-view-actions.c:761
 #: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 #: ../shell/e-shell-content.c:467
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
@@ -14990,35 +14992,36 @@ msgid "Create a new calendar"
 msgstr "Crea un calendario nuevo"
 
 #: ../modules/calendar/e-cal-shell-backend.c:717
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../plugins/itip-formatter/itip-formatter.c:2778
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:171
-#: ../modules/calendar/e-memo-shell-sidebar.c:165
-#: ../modules/calendar/e-task-shell-sidebar.c:165
-#, c-format
+#: ../modules/calendar/e-cal-shell-sidebar.c:172
+#, fuzzy, c-format
+#| msgid ""
+#| "Error on %s\n"
+#| "%s"
 msgid ""
-"Error on %s\n"
+"Error on %s: %s\n"
 "%s"
 msgstr ""
 "Error en %s:\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:239
+#: ../modules/calendar/e-cal-shell-sidebar.c:240
 msgid "Loading calendars"
 msgstr "Cargando calendarios"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:674
+#: ../modules/calendar/e-cal-shell-sidebar.c:675
 msgid "_New Calendar..."
 msgstr "Calendario _nuevo…"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:691
+#: ../modules/calendar/e-cal-shell-sidebar.c:692
 msgid "Calendar Selector"
 msgstr "Selector de calendarios"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1032
+#: ../modules/calendar/e-cal-shell-sidebar.c:1033
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abriendo el calendario en «%s»"
@@ -15432,6 +15435,16 @@ msgstr "Li_sta de notas"
 msgid "Create a new memo list"
 msgstr "Crea una lista de notas nueva"
 
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
+#, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"Error en %s:\n"
+" %s"
+
 #: ../modules/calendar/e-memo-shell-sidebar.c:233
 msgid "Loading memos"
 msgstr "Cargando notas"
@@ -15511,15 +15524,15 @@ msgstr "Imprime la lista de notas"
 msgid "Preview the list of memos to be printed"
 msgstr "Vista previa de la lista de notas para imprimir"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-memo-shell-view-private.c:417
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-memo-shell-view-private.c:421
+#: ../modules/calendar/e-task-shell-view-private.c:570
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionada"
@@ -15683,23 +15696,23 @@ msgstr "Vista previa de la lista de tareas para imprimir"
 msgid "Expunging"
 msgstr "Compactando"
 
-#: ../modules/calendar/e-task-shell-view-private.c:565
+#: ../modules/calendar/e-task-shell-view-private.c:566
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:358
 msgid "Delete Tasks"
 msgstr "Eliminar tareas"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:360
 msgid "Delete Task"
 msgstr "Eliminar tarea"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:345
+#: ../modules/mail/e-mail-attachment-handler.c:349
 #, c-format
 msgid "%d attached messages"
 msgstr "%d mensajes adjuntos"
@@ -15745,273 +15758,272 @@ msgstr "Preferencias del editor"
 msgid "Network Preferences"
 msgstr "Preferencias de red"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
-#: ../modules/mail/e-mail-shell-view.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view.c:940
 msgid "_Disable Account"
 msgstr "_Desactivar cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "Disable this account"
 msgstr "Desactivar esta cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:901
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todos los correos borrados de todas las carpetas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "C_reate Search Folder From Search..."
 msgstr "_Crear una carpeta de búsqueda desde la búsqueda…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:901
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar correos para trabajar sin conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Descargar correos para las cuentas y carpetas marcadas para usar sin conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Fl_ush Outbox"
 msgstr "Enviar correos pe_ndientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "_Copy Folder To..."
 msgstr "_Copiar carpeta a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "Copy the selected folder into another folder"
 msgstr "Copia la carpeta seleccionada en otra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:936
 msgid "Permanently remove this folder"
 msgstr "Elimina permanentemente esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "E_xpunge"
 msgstr "_Purgar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:943
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:936
+#: ../modules/mail/e-mail-shell-view-actions.c:948
 msgid "Mar_k All Messages as Read"
 msgstr "Marcar todos los mensajes como _leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 msgid "Mark all messages in the folder as read"
 msgstr "Marcar todos los mensajes en la carpeta como leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:943
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "_Move Folder To..."
 msgstr "_Mover carpeta a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:957
 msgid "Move the selected folder into another folder"
 msgstr "Mueve la carpeta seleccionada a otra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:962
 msgid "_New..."
 msgstr "_Nueva…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:964
 msgid "Create a new folder for storing mail"
 msgstr "Crea una carpeta nueva para almacenar correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "Change the properties of this folder"
 msgstr "Cambia las propiedades de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Refresh the folder"
 msgstr "Actualizar la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Change the name of this folder"
 msgstr "Cambia el nombre de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "Select Message _Thread"
 msgstr "Seleccionar con_versación del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Selecciona todos los correos en la misma conversación que el correo "
 "seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar s_ubconversación del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:987
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas las respuestas al mensaje actualmente seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
-msgid "_Unsubscribe"
-msgstr "Des_uscribir"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:994
-msgid "Unsubscribe from the selected folder"
-msgstr "Desuscribirse de la carpeta seleccionada"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "Empty _Trash"
 msgstr "_Vaciar papelera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Eliminar permanentemente todos los correos borrados de todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1018
 msgid "_New Label"
 msgstr "Etiqueta n_ueva"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
 msgid "N_one"
 msgstr "Ning_uno"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#, fuzzy
+#| msgid "_Subscriptions..."
+msgid "_Manage Subscriptions"
+msgstr "_Suscripciones…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "Cancel the current mail operation"
 msgstr "Cancela la operación de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:1069
 msgid "Collapse All _Threads"
 msgstr "_Contraer todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "Collapse all message threads"
 msgstr "Contrae todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:1076
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:1078
 msgid "Expand all message threads"
 msgstr "Expandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:1083
 msgid "_Message Filters"
 msgstr "_Filtros de correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear o editar reglas para el filtrado de correos nuevos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:1090
 msgid "Search F_olders"
 msgstr "Carpetas de búsque_da"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1092
 msgid "Create or edit search folder definitions"
 msgstr "Crear o edita definiciones para carpetas de búsqueda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1097
 msgid "_Subscriptions..."
 msgstr "_Suscripciones…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1106
 msgid "F_older"
 msgstr "_Carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1113
 msgid "_Label"
 msgstr "Etiq_ueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "_New Folder..."
 msgstr "Carpeta _nueva…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Show Message _Preview"
 msgstr "Mostrar vista _previa del correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
 msgid "Show message preview pane"
 msgstr "Mostrar el correo en el panel de vista previa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Show _Deleted Messages"
 msgstr "Mostrar los mensajes _eliminados"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 msgid "Show deleted messages with a line through them"
 msgstr "Mostrar los mensajes eliminados tachándolos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1167
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
 msgid "_Group By Threads"
 msgstr "A_grupar por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "Threaded message list"
 msgstr "Lista de correos por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "Show message preview below the message list"
 msgstr "Mostrar la vista previa del correo bajo la lista de mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1197
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Show message preview alongside the message list"
 msgstr "Mostrar la vista previa del correo junto a la lista de mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
 msgid "All Messages"
 msgstr "Todos los correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los últimos 5 días"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son SPAM"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Read Messages"
 msgstr "Mensajes leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1284
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
 msgid "Unread Messages"
 msgstr "Mensajes no leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "Subject or Addresses contain"
 msgstr "El asunto o las direcciones contienen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1353
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1360
 msgid "Current Account"
 msgstr "Cuenta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
@@ -16072,15 +16084,15 @@ msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../modules/mail/e-mail-shell-view.c:559
+#: ../modules/mail/e-mail-shell-view.c:557
 msgid "All Account Search"
 msgstr "Búsqueda en todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view.c:686
+#: ../modules/mail/e-mail-shell-view.c:740
 msgid "Account Search"
 msgstr "Búsqueda en la cuenta"
 
-#: ../modules/mail/e-mail-shell-view.c:881
+#: ../modules/mail/e-mail-shell-view.c:938
 msgid "Proxy _Logout"
 msgstr "_Cerrar sesión proxy"
 
@@ -16092,14 +16104,14 @@ msgstr "Asistente de cuentas de Evolution"
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: ../modules/mail/em-composer-prefs.c:505
-#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../modules/mail/em-composer-prefs.c:500
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:827
 #: ../widgets/misc/e-account-tree-view.c:211
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:504
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
@@ -16119,50 +16131,50 @@ msgstr "Una vez por semana"
 msgid "Once per month"
 msgstr "Una vez por mes"
 
-#: ../modules/mail/em-mailer-prefs.c:201
+#: ../modules/mail/em-mailer-prefs.c:173
 msgid "Add Custom Junk Header"
 msgstr "Añadir cabecera de SPAM personalizada"
 
-#: ../modules/mail/em-mailer-prefs.c:209
+#: ../modules/mail/em-mailer-prefs.c:181
 msgid "Header Name:"
 msgstr "Nombre de la cabecera:"
 
-#: ../modules/mail/em-mailer-prefs.c:210
+#: ../modules/mail/em-mailer-prefs.c:182
 msgid "Header Value Contains:"
 msgstr "El valor de cabecera contiene:"
 
-#: ../modules/mail/em-mailer-prefs.c:310
+#: ../modules/mail/em-mailer-prefs.c:282
 msgid "Header"
 msgstr "Cabecera"
 
-#: ../modules/mail/em-mailer-prefs.c:314
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Contains Value"
 msgstr "Contiene el valor"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
+#: ../modules/mail/em-mailer-prefs.c:677 ../modules/mail/em-mailer-prefs.c:748
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "El complemento %s está disponible y el binario está instalado."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:715 ../modules/mail/em-mailer-prefs.c:787
+#: ../modules/mail/em-mailer-prefs.c:685 ../modules/mail/em-mailer-prefs.c:757
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "El complemento %s no está disponible. Compruebe si el paquete está instalado."
 
-#: ../modules/mail/em-mailer-prefs.c:751
+#: ../modules/mail/em-mailer-prefs.c:721
 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:1143
+#: ../modules/mail/em-mailer-prefs.c:1063
 msgid "_Date header:"
 msgstr "Cabecera de _fecha:"
 
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../modules/mail/em-mailer-prefs.c:1064
 msgid "Show _original header value"
 msgstr "Mostrar el valor _original de la cabecera"
 
@@ -16181,6 +16193,35 @@ msgstr ""
 msgid "Do you want to make Evolution your default email client?"
 msgstr "¿Quiere que Evolution sea su cliente de correo predeterminado?"
 
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+msgid "Author(s)"
+msgstr "Autores(s)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+msgid "Plugin Manager"
+msgstr "Administrador de complementos"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+msgid "Note: Some changes will not take effect until restart"
+msgstr "Nota: Algunos cambios no tendrán efecto hasta que reinicie"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+msgid "Overview"
+msgstr "Vista general"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+msgid "Plugin"
+msgstr "Complemento"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+msgid "_Plugins"
+msgstr "Com_plementos"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+msgid "Enable and disable plugins"
+msgstr "Activar y desactivar complementos"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -16198,12 +16239,12 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Probar el complemento para el cargador Python EPlugin."
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:275
-#: ../widgets/misc/e-import-assistant.c:396
+#: ../widgets/misc/e-import-assistant.c:399
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione la información que quiera importar:"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:307
-#: ../widgets/misc/e-import-assistant.c:552
+#: ../widgets/misc/e-import-assistant.c:555
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
@@ -16302,15 +16343,21 @@ msgstr ""
 "Reproducir los adjuntos de sonido directamente en los mensajes de correo."
 
 #: ../plugins/backup-restore/backup-restore.c:160
-msgid "Select name of the Evolution backup file"
+#, fuzzy
+#| msgid "Select name of the Evolution backup file"
+msgid "Select name of the Evolution back up file"
 msgstr "Seleccione el nombre de archivo de respaldo Evolution"
 
 #: ../plugins/backup-restore/backup-restore.c:191
-msgid "_Restart Evolution after backup"
+#, fuzzy
+#| msgid "_Restart Evolution after backup"
+msgid "_Restart Evolution after back up"
 msgstr "_Reiniciar Evolution después del respaldo"
 
 #: ../plugins/backup-restore/backup-restore.c:217
-msgid "Select name of the Evolution backup file to restore"
+#, fuzzy
+#| msgid "Select name of the Evolution backup file to restore"
+msgid "Select name of the Evolution back up file to restore"
 msgstr ""
 "Seleccione el nombre del archivo de respaldo de Evolution para restaurar"
 
@@ -16319,8 +16366,13 @@ msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar Evolution después de la restauración"
 
 #: ../plugins/backup-restore/backup-restore.c:298
+#, fuzzy
+#| msgid ""
+#| "You can restore Evolution from your backup. It can restore all the Mails, "
+#| "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+#| "settings, mail filters etc."
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
+"You can restore Evolution from your back up. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
@@ -16329,7 +16381,9 @@ msgstr ""
 "También restaura su configuración personal, filtros de correo, etc."
 
 #: ../plugins/backup-restore/backup-restore.c:305
-msgid "_Restore Evolution from the backup file"
+#, fuzzy
+#| msgid "_Restore Evolution from the backup file"
+msgid "_Restore Evolution from the back up file"
 msgstr "_Restaurar Evolution desde el archivo de respaldo"
 
 #: ../plugins/backup-restore/backup-restore.c:312
@@ -16341,137 +16395,160 @@ msgid "Choose a file to restore"
 msgstr "Elija un archivador para restaurar"
 
 #: ../plugins/backup-restore/backup-restore.c:323
-msgid "Restore from backup"
+#, fuzzy
+#| msgid "Restore from backup"
+msgid "Restore from back up"
 msgstr "Restaurar desde un respaldo"
 
 #: ../plugins/backup-restore/backup-restore.c:361
-msgid "_Backup Evolution Settings..."
-msgstr "_Respaldar ajustes de Evolution…"
+#, fuzzy
+#| msgid "Backing up Evolution Data"
+msgid "_Back up Evolution Data..."
+msgstr "Respaldando los datos de Evolution"
 
 #: ../plugins/backup-restore/backup-restore.c:363
-msgid "Backup Evolution data and settings to an archive file"
+#, fuzzy
+#| msgid "Backup Evolution data and settings to an archive file"
+msgid "Back up Evolution data and settings to an archive file"
 msgstr "Respaldar y restaurar los datos y la configuración a un archivador"
 
 #: ../plugins/backup-restore/backup-restore.c:368
-msgid "R_estore Evolution Settings..."
-msgstr "R_estaurar ajustes de Evolution…"
+#, fuzzy
+#| msgid "Restoring Evolution Data"
+msgid "R_estore Evolution Data..."
+msgstr "Restaurando los datos de Evolution"
 
 #: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Respaldar y restaurar los datos y la configuración desde un archivador"
 
-#: ../plugins/backup-restore/backup.c:63
-msgid "Backup Evolution directory"
+#: ../plugins/backup-restore/backup.c:80
+#, fuzzy
+#| msgid "Backup Evolution directory"
+msgid "Back up Evolution directory"
 msgstr "Respaldar el directorio de Evolution"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:82
 msgid "Restore Evolution directory"
 msgstr "Restaurar el directorio de Evolution"
 
-#: ../plugins/backup-restore/backup.c:67
-msgid "Check Evolution Backup"
+#: ../plugins/backup-restore/backup.c:84
+#, fuzzy
+#| msgid "Check Evolution Backup"
+msgid "Check Evolution Back up"
 msgstr "Comprobar respaldo de Evolution"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:86
 msgid "Restart Evolution"
 msgstr "Reiniciar Evolution"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:88
 msgid "With Graphical User Interface"
 msgstr "Con interfaz gráfica de usuario"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:290
+#: ../plugins/backup-restore/backup.c:400
 msgid "Shutting down Evolution"
 msgstr "Cerrando Evolution"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:297
 msgid "Backing Evolution accounts and settings"
 msgstr "Respaldar las cuentas y la configuración de Evolution"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:305
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Respaldar los datos de Evolution (correos, contactos, calendario, tareas, "
 "notas)"
 
-#: ../plugins/backup-restore/backup.c:213
-msgid "Backup complete"
+#: ../plugins/backup-restore/backup.c:318
+#, fuzzy
+#| msgid "Backup complete"
+msgid "Back up complete"
 msgstr "Respaldo completado"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:323
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restarting Evolution"
 msgstr "Reiniciando Evolution"
 
-#: ../plugins/backup-restore/backup.c:255
+#: ../plugins/backup-restore/backup.c:404
 msgid "Back up current Evolution data"
 msgstr "Respaldar los datos actuales de Evolution"
 
-#: ../plugins/backup-restore/backup.c:260
-msgid "Extracting files from backup"
+#: ../plugins/backup-restore/backup.c:410
+#, fuzzy
+#| msgid "Extracting files from backup"
+msgid "Extracting files from back up"
 msgstr "Extrayendo archivos del respaldo"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:467
 msgid "Loading Evolution settings"
 msgstr "Carga la configuración de Evolution"
 
-#: ../plugins/backup-restore/backup.c:274
-msgid "Removing temporary backup files"
+#: ../plugins/backup-restore/backup.c:482
+#, fuzzy
+#| msgid "Removing temporary backup files"
+msgid "Removing temporary back up files"
 msgstr "Eliminando archivos temporales de respaldo"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:492
 msgid "Ensuring local sources"
 msgstr "Asegurando fuentes locales"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:679
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Respaldando a la carpeta %s"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:684
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restaurando desde la carpeta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:455
-msgid "Evolution Backup"
+#: ../plugins/backup-restore/backup.c:706
+#, fuzzy
+#| msgid "Evolution Backup"
+msgid "Evolution Back up"
 msgstr "Respaldo de Evolution"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Restore"
 msgstr "Restaurador de Evolution"
 
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:747
 msgid "Backing up Evolution Data"
 msgstr "Respaldando los datos de Evolution"
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:748
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Espere mientras Evolution respalda sus datos."
 
-#: ../plugins/backup-restore/backup.c:499
+#: ../plugins/backup-restore/backup.c:750
 msgid "Restoring Evolution Data"
 msgstr "Restaurando los datos de Evolution"
 
-#: ../plugins/backup-restore/backup.c:500
+#: ../plugins/backup-restore/backup.c:751
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Espere mientras Evolution restaura sus datos."
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:769
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Backup and Restore"
+#, fuzzy
+#| msgid "Backup and Restore"
+msgid "Back up and Restore"
 msgstr "Respaldar y restaurar"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore your Evolution data and settings."
+#, fuzzy
+#| msgid "Backup and restore your Evolution data and settings."
+msgid "Back up and restore your Evolution data and settings."
 msgstr "Respaldar y restaurar los datos y la configuración de Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
@@ -16479,14 +16556,19 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "¿Seguro que quiere cerrar Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to restore Evolution from the selected backup file?"
 msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+"Are you sure you want to restore Evolution from the selected back up file?"
 msgstr ""
 "¿Seguro que quiere restaurar Evolution desde el archivo de respaldo "
 "seleccionado?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Backup Evolution"
+#, fuzzy
+#| msgid "Close and Backup Evolution"
+msgid "Close and Back up Evolution"
 msgstr "Cerrar y respaldar Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -16498,11 +16580,15 @@ msgid "Insufficient Permissions"
 msgstr "Permisos insuficientes"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution backup file"
+#, fuzzy
+#| msgid "Invalid Evolution backup file"
+msgid "Invalid Evolution back up file"
 msgstr "Archivo de respaldo de Evolution no válido"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid backup file to restore."
+#, fuzzy
+#| msgid "Please select a valid backup file to restore."
+msgid "Please select a valid back up file to restore."
 msgstr "Seleccione un archivo de respaldo válido para restaurar."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
@@ -16510,19 +16596,29 @@ msgid "The selected folder is not writable."
 msgstr "No se puede escribir en la carpeta seleccionada."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+#, fuzzy
+#| msgid ""
+#| "To backup your data and settings, you must first close Evolution. Please "
+#| "make sure that you save any unsaved data before proceeding."
 msgid ""
-"To backup your data and settings, you must first close Evolution. Please "
+"To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 msgstr ""
 "Para respaldar sus datos y ajustes, primero debe cerrar Evolution. Asegúrese "
 "de que guarda todo dato sin guardar antes de proceder."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#, fuzzy
+#| msgid ""
+#| "To restore your data and settings, you must first close Evolution. Please "
+#| "make sure that you save any unsaved data before proceeding. This will "
+#| "delete all your current Evolution data and settings and restore them from "
+#| "your backup."
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
+"all your current Evolution data and settings and restore them from your back "
+"up."
 msgstr ""
 "Para restaurar sus datos y ajustes, primero debe cerrar Evolution. Asegúrese "
 "de que guarda todo dato sin guardar antes de proceder. Esto eliminará todos "
@@ -16584,33 +16680,33 @@ msgstr ""
 "direcciones de correo-e cuando contesta a los correos. También rellena la "
 "información de contacto de MI de su lista de amigos."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter no está disponible. Instálelo primero."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Ocurrió un error al crear %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "El proceso hijo de Bogofilter no está respondiendo, matándolo…"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Espere a que el proceso hijo de Bogofilter se interrumpa, terminando…"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Falló la tubería hacia Bogofilter, código de error: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
 msgid "Convert message text to _Unicode"
 msgstr "Convertir el texto del correo a _Unicode"
 
@@ -16741,6 +16837,13 @@ msgstr "_URL:"
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
+#: ../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:"
+
 #: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "_Examinar el servidor para un calendario"
@@ -17034,7 +17137,7 @@ msgstr ""
 "Lanzar el editor automáticamente al pulsar una tecla en el editor de correos"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:126
+#: ../plugins/external-editor/external-editor.c:129
 msgid "Automatically launch when a new mail is edited"
 msgstr "Lanzar automáticamente al editar un correo nuevo"
 
@@ -17046,11 +17149,11 @@ msgstr "Editor externo predeterminado"
 msgid "The default command that must be used as the editor."
 msgstr "El comando predeterminado que usar como editor."
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Command to be executed to launch the editor: "
 msgstr "Comando que ejecutar para lanzar el editor: "
 
-#: ../plugins/external-editor/external-editor.c:116
+#: ../plugins/external-editor/external-editor.c:119
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17058,8 +17161,8 @@ msgstr ""
 "Para Emacs use «xemacs»\n"
 "Para VI use «gvim -f»"
 
-#: ../plugins/external-editor/external-editor.c:382
-#: ../plugins/external-editor/external-editor.c:384
+#: ../plugins/external-editor/external-editor.c:385
+#: ../plugins/external-editor/external-editor.c:387
 msgid "Compose in External Editor"
 msgstr "Redactar en un editor externo"
 
@@ -17191,8 +17294,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:548
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:956
 msgid "Unknown error."
 msgstr "Error desconocido."
 
@@ -17244,12 +17347,12 @@ msgstr "Aceptar provisionalmente"
 msgid "Rese_nd Meeting..."
 msgstr "Reen_viar reunión…"
 
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../plugins/groupwise-features/install-shared.c:170
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: ../plugins/groupwise-features/install-shared.c:217
+#: ../plugins/groupwise-features/install-shared.c:222
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17274,11 +17377,11 @@ msgstr ""
 "Pulse «Aplicar» para instalar la carpeta compartida\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:229
+#: ../plugins/groupwise-features/install-shared.c:234
 msgid "Install the shared folder"
 msgstr "Instalar la carpeta compartida"
 
-#: ../plugins/groupwise-features/install-shared.c:233
+#: ../plugins/groupwise-features/install-shared.c:238
 msgid "Shared Folder Installation"
 msgstr "Instalación de carpeta compartida"
 
@@ -17308,7 +17411,7 @@ msgid "_Junk List"
 msgstr "Lista de _SPAM"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../plugins/groupwise-features/properties.ui.h:12
 #: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "_Quitar"
@@ -17333,6 +17436,11 @@ msgstr "Correo retirado con éxito"
 msgid "Insert Send options"
 msgstr "Insertar opciones de envío"
 
+#: ../plugins/groupwise-features/notification.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:6
+msgid "The participants will receive the following notification.\n"
+msgstr "Los participantes recibirán la notificación siguiente.\n"
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
 msgstr "Añadir opciones de envío a los correos de GroupWise"
@@ -17457,30 +17565,22 @@ msgstr "_Personalizar el mensaje de notificación"
 msgid "Con_tacts..."
 msgstr "Con_tactos…"
 
-#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Shared Folder Notification"
 msgstr "Notificación de carpeta compartida"
 
-#: ../plugins/groupwise-features/properties.ui.h:7
-msgid "The participants will receive the following notification.\n"
-msgstr "Los participantes recibirán la notificación siguiente.\n"
-
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "Users:"
 msgstr "Usuarios:"
 
-#: ../plugins/groupwise-features/properties.ui.h:12
+#: ../plugins/groupwise-features/properties.ui.h:11
 msgid "_Not Shared"
 msgstr "_Sin compartir"
 
-#: ../plugins/groupwise-features/properties.ui.h:14
+#: ../plugins/groupwise-features/properties.ui.h:13
 msgid "_Shared With..."
 msgstr "_Compartir con…"
 
-#: ../plugins/groupwise-features/properties.ui.h:15
-msgid "_Sharing"
-msgstr "_Compartir"
-
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "Derechos de acceso"
@@ -17561,85 +17661,85 @@ msgid "Proxy"
 msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy.c:926
-#: ../plugins/groupwise-features/share-folder.c:691
+#: ../plugins/groupwise-features/share-folder.c:692
 msgid "Add User"
 msgstr "Añadir usuario"
 
-#: ../plugins/groupwise-features/send-options.c:212
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "Opciones de envío avanzadas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:309
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/groupwise-features/share-folder-common.c:315
+#: ../plugins/groupwise-features/share-folder.c:727
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr "Introduzca los usuarios y establezca permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:410
+#: ../plugins/groupwise-features/share-folder-common.c:412
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../plugins/groupwise-features/share-folder.c:529
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "Notificación personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:731
+#: ../plugins/groupwise-features/share-folder.c:732
 msgid "Add   "
 msgstr "Añadir   "
 
-#: ../plugins/groupwise-features/share-folder.c:737
+#: ../plugins/groupwise-features/share-folder.c:738
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "Message Status"
 msgstr "Estado del mensaje"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:139
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:153
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:168
 msgid "Creation date:"
 msgstr "Fecha de creación:"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:208
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../plugins/groupwise-features/status-track.c:213
+#: ../plugins/groupwise-features/status-track.c:215
 msgid "Delivered: "
 msgstr "Entregado: "
 
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:221
 msgid "Opened: "
 msgstr "Abierto: "
 
-#: ../plugins/groupwise-features/status-track.c:224
+#: ../plugins/groupwise-features/status-track.c:226
 msgid "Accepted: "
 msgstr "Aceptado: "
 
-#: ../plugins/groupwise-features/status-track.c:229
+#: ../plugins/groupwise-features/status-track.c:231
 msgid "Deleted: "
 msgstr "Borrado: "
 
-#: ../plugins/groupwise-features/status-track.c:234
+#: ../plugins/groupwise-features/status-track.c:236
 msgid "Declined: "
 msgstr "Rechazado: "
 
-#: ../plugins/groupwise-features/status-track.c:239
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Completed: "
 msgstr "Completado: "
 
-#: ../plugins/groupwise-features/status-track.c:244
+#: ../plugins/groupwise-features/status-track.c:246
 msgid "Undelivered: "
 msgstr "Sin entregar: "
 
@@ -17705,142 +17805,142 @@ msgstr "Características IMAP"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:486
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Falló al cargar el calendario «%s» (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:649
+#: ../plugins/itip-formatter/itip-formatter.c:650
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Una cita en el calendario «%s» entra en conflicto con esta reunión"
 
-#: ../plugins/itip-formatter/itip-formatter.c:685
+#: ../plugins/itip-formatter/itip-formatter.c:686
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Se encontró la cita en el calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:784
+#: ../plugins/itip-formatter/itip-formatter.c:785
 msgid "Unable to find any calendars"
 msgstr "No se puede encontrar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:792
 msgid "Unable to find this meeting in any calendar"
 msgstr "No se puede encontrar esta reunión en ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to find this task in any task list"
 msgstr "No se puede encontrar esta tarea en ninguna lista de tareas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:799
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to find this memo in any memo list"
 msgstr "No se puede encontrar esta nota en ninguna lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Opening the calendar. Please wait.."
 msgstr "Abriendo el calendario. Espere…"
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:879
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando una versión existente de esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1162
 msgid "Unable to parse item"
 msgstr "No es posible interpretar el elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "No es posible enviar el elemento al calendario «%s»: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado al calendario «%s» como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1267
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado al calendario «%s» como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado al calendario «%s» como rehusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1277
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado al calendario «%s» como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "El organizador ha quitado al delegado %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1380
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No es posible enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1491
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "El estado de asistencia no pudo actualizarse debido a que el estado es "
 "inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1520
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1524
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1550
 msgid "Meeting information sent"
 msgstr "Información de reunión enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1553
 msgid "Task information sent"
 msgstr "Información de la tarea enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1556
 msgid "Memo information sent"
 msgstr "Información de la nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1565
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No se puede enviar la información de la reunión, la reunión no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1568
 msgid "Unable to send task information, the task does not exist"
 msgstr "No se puede enviar la información de la tarea, la tarea no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1571
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "No se puede enviar la información de la nota, la nota no existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1636
 msgid "calendar.ics"
 msgstr "calendario.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1641
 msgid "Save Calendar"
 msgstr "Guardar calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1693
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1694
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17848,15 +17948,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1638
-#: ../plugins/itip-formatter/itip-formatter.c:1666
-#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../plugins/itip-formatter/itip-formatter.c:1745
+#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1882
 msgid "The item in the calendar is not valid"
 msgstr "El elemento en el calendario no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1746
+#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1883
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17864,11 +17964,11 @@ msgstr ""
 "El mensaje contiene un calendario, pero el calendario no contiene ningún "
 "acontecimiento, tarea o información de disponibilidad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1680
+#: ../plugins/itip-formatter/itip-formatter.c:1787
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos múltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1788
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17876,31 +17976,31 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2454
+#: ../plugins/itip-formatter/itip-formatter.c:2563
 msgid "This meeting recurs"
 msgstr "Esta reunión se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2566
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2569
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2803
 msgid "_Delete message after acting"
 msgstr "_Eliminar el mensaje después de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2704
-#: ../plugins/itip-formatter/itip-formatter.c:2737
+#: ../plugins/itip-formatter/itip-formatter.c:2813
+#: ../plugins/itip-formatter/itip-formatter.c:2846
 msgid "Conflict Search"
 msgstr "Búsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2719
+#: ../plugins/itip-formatter/itip-formatter.c:2828
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
@@ -18273,7 +18373,7 @@ msgstr "Día de inicio:"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1053
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
@@ -18283,7 +18383,7 @@ msgstr "Día de fin:"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1065
 msgid "End time:"
 msgstr "Hora de fin:"
 
@@ -18342,41 +18442,41 @@ msgid "_Update"
 msgstr "_Actualizar"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1084
-#: ../plugins/itip-formatter/itip-view.c:1138
+#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1139
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1123
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "Send _reply to sender"
 msgstr "_Responder al remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1153
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "Send _updates to attendees"
 msgstr "Mandar _actualizaciones a los participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas las instancias"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1174
+#: ../plugins/itip-formatter/itip-view.c:1175
 msgid "_Preserve my reminder"
 msgstr "Conser_var mi recordatorio"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1180
+#: ../plugins/itip-formatter/itip-view.c:1181
 msgid "_Inherit reminder"
 msgstr "_Heredar recordatorio"
 
-#: ../plugins/itip-formatter/itip-view.c:1923
+#: ../plugins/itip-formatter/itip-view.c:1924
 msgid "_Tasks:"
 msgstr "_Tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1925
+#: ../plugins/itip-formatter/itip-view.c:1926
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -18579,7 +18679,7 @@ msgstr "Le notifica cuando llega un mensaje de correo nuevo."
 msgid "Created from a mail by %s"
 msgstr "Creado desde un correo de %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:489
+#: ../plugins/mail-to-task/mail-to-task.c:490
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18588,7 +18688,7 @@ msgstr ""
 "El calendario seleccionado ya contiene el acontecimiento «%s». ¿Quiere editar "
 "el acontecimiento antiguo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:492
+#: ../plugins/mail-to-task/mail-to-task.c:493
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18597,7 +18697,7 @@ msgstr ""
 "La lista de tareas seleccionada ya contiene la tarea «%s». ¿Quiere editar la "
 "tarea antigua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:495
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18609,7 +18709,7 @@ msgstr ""
 #. 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
+#: ../plugins/mail-to-task/mail-to-task.c:516
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18620,7 +18720,7 @@ msgstr ""
 #. 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
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18631,7 +18731,7 @@ msgstr ""
 #. 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
+#: ../plugins/mail-to-task/mail-to-task.c:528
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18642,7 +18742,7 @@ msgstr ""
 #. 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
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18659,7 +18759,7 @@ msgstr[1] ""
 #. 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
+#: ../plugins/mail-to-task/mail-to-task.c:558
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18676,7 +18776,7 @@ msgstr[1] ""
 #. 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
+#: ../plugins/mail-to-task/mail-to-task.c:567
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18690,25 +18790,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:625
+#: ../plugins/mail-to-task/mail-to-task.c:626
 msgid "[No Summary]"
 msgstr "[Sin resumen]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:637
 msgid "Invalid object returned from a server"
 msgstr "Un servidor devolvió un objeto no válido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:707
+#: ../plugins/mail-to-task/mail-to-task.c:708
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Ocurrió un error al procesar: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:737
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "No se puede abrir el calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:743
+#: ../plugins/mail-to-task/mail-to-task.c:744
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18716,7 +18816,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:746
+#: ../plugins/mail-to-task/mail-to-task.c:747
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18724,7 +18824,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:749
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18732,40 +18832,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:952
+#: ../plugins/mail-to-task/mail-to-task.c:956
 #, 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:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1075
 msgid "Create an _Event"
 msgstr "Crear un _acontecimiento"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1073
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 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:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1082
 msgid "Create a Mem_o"
 msgstr "Crear una _nota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1080
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 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:1085
+#: ../plugins/mail-to-task/mail-to-task.c:1089
 msgid "Create a _Task"
 msgstr "Crear una _tarea"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1087
+#: ../plugins/mail-to-task/mail-to-task.c:1091
 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:1095
+#: ../plugins/mail-to-task/mail-to-task.c:1099
 msgid "Create a _Meeting"
 msgstr "Crear una _reunión"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1097
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Create a new meeting from the selected message"
 msgstr "Crear una reunión nueva del mensaje seleccionado"
 
@@ -18939,7 +19039,7 @@ msgstr "En la carpeta actual y _subcarpetas"
 msgid "In Current _Folder Only"
 msgstr "Sólo en la ca_rpeta actual"
 
-#: ../plugins/mark-all-read/mark-all-read.c:439
+#: ../plugins/mark-all-read/mark-all-read.c:443
 msgid "Mark Me_ssages as Read"
 msgstr "Marcar los mensajes como _leídos"
 
@@ -18951,40 +19051,6 @@ msgstr "Marcar todo como leído"
 msgid "Mark all messages in a folder as read."
 msgstr "Marcar todos los mensajes en una carpeta como leídos."
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "Manage your Evolution plugins."
-msgstr "Gestionar sus complementos de Evolution"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
-msgid "Plugin Manager"
-msgstr "Administrador de complementos"
-
-#: ../plugins/plugin-manager/plugin-manager.c:59
-msgid "Author(s)"
-msgstr "Autores(s)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:259
-msgid "Note: Some changes will not take effect until restart"
-msgstr "Nota: Algunos cambios no tendrán efecto hasta que reinicie"
-
-#: ../plugins/plugin-manager/plugin-manager.c:285
-msgid "Overview"
-msgstr "Vista general"
-
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
-msgid "Plugin"
-msgstr "Complemento"
-
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "Com_plementos"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-msgstr "Activar y desactivar complementos"
-
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -18998,19 +19064,19 @@ msgstr "Preferir texto plano"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Ver los mensajes de correo en texto plano, incluso si contienen HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:214
 msgid "Show HTML if present"
 msgstr "Mostrar HTML si está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:214
 msgid "Let Evolution choose the best part to show."
 msgstr "Permitir que Evolution elija la mejor parte para mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:215
 msgid "Show plain text if present"
 msgstr "Mostrar texto plano si está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:215
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19018,11 +19084,11 @@ msgstr ""
 "Mostrar la parte en texto plano si está presente, de otra forma dejar que "
 "Evolution elija la mejor parte para mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:216
 msgid "Only ever show plain text"
 msgstr "Sólo mostrar texto plano"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:216
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19030,11 +19096,11 @@ msgstr ""
 "Mostrar siempre parte en texto plano y, si se solicita, crear adjuntos de "
 "otras partes."
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:263
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Mostrar las partes HTML s_uprimidas como adjuntos"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:283
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -19058,35 +19124,35 @@ msgstr "Importador PST de Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Carpetas personales de Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:295
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "Co_rreo"
 
-#: ../plugins/pst-import/pst-importer.c:307
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "Carpeta de destino:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:313
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
 msgstr "Libreta de _direcciones"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tareas"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:334
 msgid "_Journal entries"
 msgstr "Entradas del dia_rio"
 
-#: ../plugins/pst-import/pst-importer.c:347
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
 msgstr "_Importando datos de Outlook"
 
@@ -19253,47 +19319,47 @@ msgstr "Ubicación nueva"
 msgid "Edit Location"
 msgstr "Editar ubicación"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "No se encontró SpamAssasin, código: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Falló al crear la tubería: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Error después de bifurcar: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "El proceso hijo de SpamAssasin no está respondiendo, matándolo…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Falló la tubería hacia SpamAssasin, código de error: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssasin no está disponible. Instálelo primero."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:940
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Esto hará que SpamAssasin sea más exacto, pero más lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:948
 msgid "I_nclude remote tests"
 msgstr "I_ncluir tests remotos"
 
@@ -19430,23 +19496,6 @@ msgstr "Guardar la lista de notas seleccionada al disco"
 msgid "Save the selected task list to disk"
 msgstr "Guardar la lista de tareas seleccionada al disco"
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Sort mail message threads by subject."
-msgstr "Ordenar conversaciones de mensajes de correo por asunto."
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-msgid "Subject Threading"
-msgstr "Agrupación según el asunto"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-msgid "Thread messages by subject"
-msgstr "Agrupar mensajes según el asunto"
-
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:63
-msgid "F_all back to threading messages by subject"
-msgstr "Agrupar los mensajes por _asunto"
-
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -19459,15 +19508,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Borradores basados en el complemento de plantillas"
 
-#: ../plugins/templates/templates.c:621
+#: ../plugins/templates/templates.c:625
 msgid "No Title"
 msgstr "Sin título"
 
-#: ../plugins/templates/templates.c:715
+#: ../plugins/templates/templates.c:719
 msgid "Save as _Template"
 msgstr "Guardar como plan_tilla"
 
-#: ../plugins/templates/templates.c:717
+#: ../plugins/templates/templates.c:721
 msgid "Save as Template"
 msgstr "Guardar como plantilla"
 
@@ -19488,27 +19537,27 @@ msgstr "vCards en línea"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar vCards directamente en los mensajes de correo."
 
-#: ../plugins/vcard-inline/vcard-inline.c:181
-#: ../plugins/vcard-inline/vcard-inline.c:266
+#: ../plugins/vcard-inline/vcard-inline.c:182
+#: ../plugins/vcard-inline/vcard-inline.c:267
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:184
+#: ../plugins/vcard-inline/vcard-inline.c:185
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:246
 msgid "There is one other contact."
 msgstr "Hay otro contacto más."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:255
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hay %d contacto más."
 msgstr[1] "Hay otros %d contactos."
 
-#: ../plugins/vcard-inline/vcard-inline.c:275
+#: ../plugins/vcard-inline/vcard-inline.c:276
 msgid "Save in Address Book"
 msgstr "Guardar en la libreta de direcciones"
 
@@ -19694,7 +19743,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:332
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:337
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
@@ -19867,19 +19916,19 @@ msgstr "Guardar búsqueda"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:929
+#: ../shell/e-shell-searchbar.c:932
 msgid "Sho_w:"
 msgstr "M_ostrar:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:960
+#: ../shell/e-shell-searchbar.c:963
 msgid "Sear_ch:"
 msgstr "B_uscar:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1021
+#: ../shell/e-shell-searchbar.c:1024
 msgid "i_n"
 msgstr "e_n"
 
@@ -20197,20 +20246,20 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "Nuevo"
 
-#: ../shell/e-shell.c:244
+#: ../shell/e-shell.c:247
 msgid "Preparing to go offline..."
 msgstr "Preparándose para desconectarse…"
 
-#: ../shell/e-shell.c:294
+#: ../shell/e-shell.c:300
 msgid "Preparing to go online..."
 msgstr "Preparándose para conectarse…"
 
-#: ../shell/e-shell.c:353
+#: ../shell/e-shell.c:362
 msgid "Preparing to quit..."
 msgstr "Preparándose para salir…"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:181
+#: ../shell/main.c:186
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20246,7 +20295,7 @@ msgstr ""
 "Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
 "esperamos su contribución.\n"
 
-#: ../shell/main.c:205
+#: ../shell/main.c:210
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20254,55 +20303,55 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:217
 msgid "Do not tell me again"
 msgstr "No preguntarme más veces"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:333
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:335
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar la geometría proporcionada a la ventana principal"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:339
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:336
+#: ../shell/main.c:341
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo «exprés»"
 
-#: ../shell/main.c:339
+#: ../shell/main.c:344
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar el cierre de Evolution"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:347
 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:344
+#: ../shell/main.c:349
 msgid "Disable loading of any plugins."
 msgstr "Desactivar la carga de cualquier complemento."
 
-#: ../shell/main.c:346
+#: ../shell/main.c:351
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar la vista previa del correo, contactos y tareas."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:355
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importar URI o nombres de archivos proporcionados como argumentos."
 
-#: ../shell/main.c:352
+#: ../shell/main.c:357
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar que el proceso de ejecución de Evolution finalice"
 
-#: ../shell/main.c:476 ../shell/main.c:484
+#: ../shell/main.c:507 ../shell/main.c:515
 msgid "- The Evolution PIM and Email Client"
 msgstr "El cliente de correo-e y GIP Evolution"
 
-#: ../shell/main.c:546
+#: ../shell/main.c:577
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20392,28 +20441,28 @@ msgstr "El archivo no es un archivo .desktop válido"
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "No se reconoce la versión «%s» del archivo desktop"
 
-#: ../smclient/eggdesktopfile.c:958
+#: ../smclient/eggdesktopfile.c:957
 #, c-format
 msgid "Starting %s"
 msgstr "Iniciando %s"
 
-#: ../smclient/eggdesktopfile.c:1100
+#: ../smclient/eggdesktopfile.c:1098
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "La aplicación no acepta documentos en la línea de comandos"
 
-#: ../smclient/eggdesktopfile.c:1168
+#: ../smclient/eggdesktopfile.c:1166
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Opción de lanzamiento no reconocida: %d"
 
-#: ../smclient/eggdesktopfile.c:1373
+#: ../smclient/eggdesktopfile.c:1365
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 "No se pueden pasar los URI de documentos a entradas de escritorio «Type=Link»"
 
-#: ../smclient/eggdesktopfile.c:1394
+#: ../smclient/eggdesktopfile.c:1386
 #, c-format
 msgid "Not a launchable item"
 msgstr "No es un elemento lanzable"
@@ -21099,7 +21148,7 @@ msgstr "Tipo de vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-account-manager.c:351
+#: ../widgets/misc/e-account-manager.c:354
 msgid "De_fault"
 msgstr "_Predeterminada"
 
@@ -21161,7 +21210,7 @@ msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de adjuntos"
 
 #: ../widgets/misc/e-attachment-paned.c:100
-#: ../widgets/misc/e-attachment-paned.c:631
+#: ../widgets/misc/e-attachment-paned.c:615
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de adjuntos"
 
@@ -21181,40 +21230,40 @@ msgstr[1] "Guardar los adjuntos"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:608
-#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
+#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:351
+#: ../widgets/misc/e-attachment-view.c:353
 msgid "S_ave All"
 msgstr "Guardar _todo"
 
-#: ../widgets/misc/e-attachment-view.c:377
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "A_dd Attachment..."
 msgstr "_Añadir adjunto…"
 
-#: ../widgets/misc/e-attachment-view.c:401
+#: ../widgets/misc/e-attachment-view.c:403
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../widgets/misc/e-attachment-view.c:408
+#: ../widgets/misc/e-attachment-view.c:410
 msgid "Hid_e All"
 msgstr "_Ocular todo"
 
-#: ../widgets/misc/e-attachment-view.c:415
+#: ../widgets/misc/e-attachment-view.c:417
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../widgets/misc/e-attachment-view.c:422
+#: ../widgets/misc/e-attachment-view.c:424
 msgid "Vie_w All Inline"
 msgstr "_Ver tolo en línea"
 
-#: ../widgets/misc/e-attachment-view.c:739
+#: ../widgets/misc/e-attachment-view.c:741
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Abrir con «%s»"
 
-#: ../widgets/misc/e-attachment-view.c:742
+#: ../widgets/misc/e-attachment-view.c:744
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Abrir este adjunto en %s"
@@ -21227,55 +21276,55 @@ msgstr "Abrir este adjunto en %s"
 msgid "Attached message"
 msgstr "Mensaje adjunto"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
 msgid "A load operation is already in progress"
 msgstr "Existe una operación de carga en progreso"
 
-#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
 msgid "A save operation is already in progress"
 msgstr "Existe una operación de guardado en progreso"
 
-#: ../widgets/misc/e-attachment.c:1928
+#: ../widgets/misc/e-attachment.c:1929
 #, c-format
 msgid "Could not load '%s'"
 msgstr "No se pudo cargar «%s»"
 
-#: ../widgets/misc/e-attachment.c:1931
+#: ../widgets/misc/e-attachment.c:1932
 #, c-format
 msgid "Could not load the attachment"
 msgstr "No se pudo cargar el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2207
+#: ../widgets/misc/e-attachment.c:2208
 #, c-format
 msgid "Could not open '%s'"
 msgstr "No se pudo abrir «%s»"
 
-#: ../widgets/misc/e-attachment.c:2210
+#: ../widgets/misc/e-attachment.c:2211
 #, c-format
 msgid "Could not open the attachment"
 msgstr "No se pudo abrir el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2645
+#: ../widgets/misc/e-attachment.c:2646
 msgid "Attachment contents not loaded"
 msgstr "No se cargó el contenido del adjunto"
 
-#: ../widgets/misc/e-attachment.c:2721
+#: ../widgets/misc/e-attachment.c:2722
 #, c-format
 msgid "Could not save '%s'"
 msgstr "No se pudo guardar «%s»"
 
-#: ../widgets/misc/e-attachment.c:2724
+#: ../widgets/misc/e-attachment.c:2725
 #, c-format
 msgid "Could not save the attachment"
 msgstr "No se pudo guardar el adjunto"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:362
 msgid "Ctrl-click to open a link"
 msgstr "Pulse Ctrl-botón del ratón para abrir un enlace"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1258
+#: ../widgets/misc/e-calendar-item.c:1261
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21295,52 +21344,52 @@ msgstr "Introduzca el conjunto de caracteres a usar"
 msgid "Other..."
 msgstr "Otro…"
 
-#: ../widgets/misc/e-dateedit.c:505
+#: ../widgets/misc/e-dateedit.c:508
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
-#: ../widgets/misc/e-dateedit.c:526
+#: ../widgets/misc/e-dateedit.c:529
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir la fecha"
 
-#: ../widgets/misc/e-dateedit.c:548
+#: ../widgets/misc/e-dateedit.c:551
 msgid "Click this button to show a calendar"
 msgstr "Pulse este botón para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:594
+#: ../widgets/misc/e-dateedit.c:597
 msgid "Drop-down combination box to select time"
 msgstr "Caja combo desplegable para seleccionar la hora"
 
-#: ../widgets/misc/e-dateedit.c:666
+#: ../widgets/misc/e-dateedit.c:669
 msgid "No_w"
 msgstr "_Ahora"
 
-#: ../widgets/misc/e-dateedit.c:672
+#: ../widgets/misc/e-dateedit.c:675
 msgid "_Today"
 msgstr "_Hoy"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:680
+#: ../widgets/misc/e-dateedit.c:683
 msgid "_None"
 msgstr "_Ninguna"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1920
 msgctxt "date"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../widgets/misc/e-dateedit.c:1812
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "Valor de fecha inválido"
 
-#: ../widgets/misc/e-dateedit.c:1856
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "Valor de hora inválido"
 
-#: ../widgets/misc/e-import-assistant.c:249
+#: ../widgets/misc/e-import-assistant.c:252
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21348,37 +21397,37 @@ msgstr ""
 "Elija el archivo que quiere importar en Evolution y seleccione de la lista "
 "el tipo de archivo que es."
 
-#: ../widgets/misc/e-import-assistant.c:266
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "F_ilename:"
 msgstr "Nombre del _archivo:"
 
-#: ../widgets/misc/e-import-assistant.c:276
+#: ../widgets/misc/e-import-assistant.c:279
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: ../widgets/misc/e-import-assistant.c:290
-#: ../widgets/misc/e-import-assistant.c:465
+#: ../widgets/misc/e-import-assistant.c:293
+#: ../widgets/misc/e-import-assistant.c:468
 msgid "File _type:"
 msgstr "_Tipo de archivo:"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:916
+#: ../widgets/misc/e-import-assistant.c:336
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Choose the destination for this import"
 msgstr "Elija el destino de esta importación"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:361
 msgid "Choose the type of importer to run:"
 msgstr "Elija el tipo de importador a ejecutar:"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:369
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuración de programas _antiguos"
 
-#: ../widgets/misc/e-import-assistant.c:374
+#: ../widgets/misc/e-import-assistant.c:377
 msgid "Import a _single file"
 msgstr "Importar un _único archivo"
 
-#: ../widgets/misc/e-import-assistant.c:526
+#: ../widgets/misc/e-import-assistant.c:529
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21390,37 +21439,37 @@ msgstr ""
 "botón «Atrás»."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:773
+#: ../widgets/misc/e-import-assistant.c:769
 msgid "_Cancel Import"
 msgstr "_Cancelar la importación"
 
-#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:911
 msgid "Preview data to be imported"
 msgstr "Vista previa de los datos para importar"
 
-#: ../widgets/misc/e-import-assistant.c:921
-#: ../widgets/misc/e-import-assistant.c:934
-#: ../widgets/misc/e-import-assistant.c:1284
-#: ../widgets/misc/e-import-assistant.c:1350
-#: ../widgets/misc/e-import-assistant.c:1359
+#: ../widgets/misc/e-import-assistant.c:917
+#: ../widgets/misc/e-import-assistant.c:930
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1346
+#: ../widgets/misc/e-import-assistant.c:1355
 msgid "Import Data"
 msgstr "Importar datos"
 
-#: ../widgets/misc/e-import-assistant.c:929
+#: ../widgets/misc/e-import-assistant.c:925
 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:1274
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid "Evolution Import Assistant"
 msgstr "Asistente de importación de Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1291
-#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1287
+#: ../widgets/misc/e-import-assistant.c:1334
 msgid "Import Location"
 msgstr "Lugar de importación"
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21430,27 +21479,27 @@ 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:1316
+#: ../widgets/misc/e-import-assistant.c:1312
 msgid "Importer Type"
 msgstr "Tipo de importador"
 
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Select Information to Import"
 msgstr "Seleccione la imformación para importar"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "Seleccione un archivo"
 
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:1341
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Pulse «Aplicar» para comenzar a importar el archivo en Evolution."
 
-#: ../widgets/misc/e-map.c:557
+#: ../widgets/misc/e-map.c:538
 msgid "World Map"
 msgstr "Mapa mundial"
 
-#: ../widgets/misc/e-map.c:559
+#: ../widgets/misc/e-map.c:540
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21476,52 +21525,52 @@ msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Actualmente Evolution está desconectado porque la red no está disponible."
 
-#: ../widgets/misc/e-preferences-window.c:278
+#: ../widgets/misc/e-preferences-window.c:281
 msgid "Evolution Preferences"
 msgstr "Preferencias de Evolution"
 
-#: ../widgets/misc/e-search-bar.c:81
+#: ../widgets/misc/e-search-bar.c:84
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:560
 msgid "Close the find bar"
 msgstr "Cerrar la barra de búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:568
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:580
 msgid "Clear the search"
 msgstr "Limpiar la búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:600
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:609
 msgid "Find the previous occurrence of the phrase"
 msgstr "Buscar la coincidencia anterior de la frase"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:619
 msgid "_Next"
 msgstr "_Siguiente"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:625
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar la siguiente coincidencia de la frase"
 
-#: ../widgets/misc/e-search-bar.c:632
+#: ../widgets/misc/e-search-bar.c:635
 msgid "Mat_ch case"
 msgstr "_Coincidir con capitalización"
 
-#: ../widgets/misc/e-search-bar.c:660
+#: ../widgets/misc/e-search-bar.c:663
 msgid "Reached bottom of page, continued from top"
 msgstr "Se llegó al final de la página, continuando desde el principio"
 
-#: ../widgets/misc/e-search-bar.c:682
+#: ../widgets/misc/e-search-bar.c:685
 msgid "Reached top of page, continued from bottom"
 msgstr "Se llegó al principio de la página, continuando desde el final"
 
@@ -21656,34 +21705,34 @@ msgctxt "send-options"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../widgets/misc/e-signature-editor.c:136
-#: ../widgets/misc/e-signature-editor.c:524
-#: ../widgets/misc/e-signature-manager.c:353
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:526
+#: ../widgets/misc/e-signature-manager.c:356
 #: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: ../widgets/misc/e-signature-editor.c:213
+#: ../widgets/misc/e-signature-editor.c:215
 msgid "_Save and Close"
 msgstr "_Guardar y cerrar"
 
-#: ../widgets/misc/e-signature-editor.c:391
+#: ../widgets/misc/e-signature-editor.c:393
 msgid "Edit Signature"
 msgstr "Editar firma"
 
-#: ../widgets/misc/e-signature-editor.c:406
+#: ../widgets/misc/e-signature-editor.c:408
 msgid "_Signature Name:"
 msgstr "Nombre de la _firma"
 
-#: ../widgets/misc/e-signature-manager.c:298
+#: ../widgets/misc/e-signature-manager.c:301
 msgid "Add Signature Script"
 msgstr "Añadir un script de firma"
 
-#: ../widgets/misc/e-signature-manager.c:363
+#: ../widgets/misc/e-signature-manager.c:366
 msgid "Edit Signature Script"
 msgstr "Editar script de firma"
 
-#: ../widgets/misc/e-signature-manager.c:579
+#: ../widgets/misc/e-signature-manager.c:582
 msgid "Add _Script"
 msgstr "Añadir _script"
 
@@ -21762,7 +21811,7 @@ msgstr "Calendario: desde %s a %s"
 msgid "evolution calendar item"
 msgstr "elemento de calendario de Evolution"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr "lista emergente"
 
@@ -21789,34 +21838,34 @@ msgstr "La fecha debe estar en el formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100, inclusive"
 
-#: ../widgets/table/e-table-click-to-add.c:595
+#: ../widgets/table/e-table-click-to-add.c:598
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "pulse para añadir"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(Ascendente)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(Descendente)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "Sin ordenar"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "Sin agrupar"
 
-#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Mostrar campos"
 
-#: ../widgets/table/e-table-config.c:667
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "Campos disponibles"
 
@@ -21825,7 +21874,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos _disponibles:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1704
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -21838,7 +21887,7 @@ msgid "Clear _All"
 msgstr "Quitar _todo"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1704
 msgid "Descending"
 msgstr "Descendente"
 
@@ -21917,7 +21966,7 @@ msgstr ""
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:354
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21930,72 +21979,72 @@ msgstr[1] "%s: %s (%d elementos)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:366
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-header-item.c:1546
+#: ../widgets/table/e-table-header-item.c:1548
 msgid "Customize Current View"
 msgstr "Personalizar vista actual"
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1569
 msgid "Sort _Ascending"
 msgstr "Ordenar _ascendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1572
 msgid "Sort _Descending"
 msgstr "Ordenar _descendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1575
 msgid "_Unsort"
 msgstr "_Desordenar"
 
-#: ../widgets/table/e-table-header-item.c:1576
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Group By This _Field"
 msgstr "Agrupar por _este campo"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Group By _Box"
 msgstr "Agrupar por _caja"
 
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "Remove This _Column"
 msgstr "Quitar esta c_olumna"
 
-#: ../widgets/table/e-table-header-item.c:1586
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "Add a C_olumn..."
 msgstr "Añadir una c_olumna…"
 
-#: ../widgets/table/e-table-header-item.c:1590
+#: ../widgets/table/e-table-header-item.c:1592
 msgid "A_lignment"
 msgstr "A_lineación"
 
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "B_est Fit"
 msgstr "Ajust_e automático"
 
-#: ../widgets/table/e-table-header-item.c:1596
+#: ../widgets/table/e-table-header-item.c:1598
 msgid "Format Column_s..."
 msgstr "Formatear columna_s…"
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar vista actual…"
 
-#: ../widgets/table/e-table-header-item.c:1659
+#: ../widgets/table/e-table-header-item.c:1661
 msgid "_Sort By"
 msgstr "_Ordenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1677
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:126
 msgid "popup a child"
 msgstr "emerger un descendiente"
 
@@ -22031,14 +22080,171 @@ msgstr "pulsar"
 msgid "sort"
 msgstr "ordenar"
 
-#: ../widgets/text/e-text.c:2536
+#: ../widgets/text/e-text.c:2538
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../widgets/text/e-text.c:2548
+#: ../widgets/text/e-text.c:2550
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
+#~ msgid "%s..."
+#~ msgstr "%s…"
+
+#~ msgid "Evolution Error"
+#~ msgstr "Error de Evolution"
+
+#~ msgid "Evolution Warning"
+#~ msgstr "Advertencia de Evolution"
+
+#~ msgid "Internal error, unknown error '%s' requested"
+#~ msgstr "Error interno, solicitado un error desconocido «%s»"
+
+#~ msgid "This store does not support subscriptions, or they are not enabled."
+#~ msgstr "Este almacén no soporta suscripciones, o no están activadas."
+
+#~ msgid "Folder"
+#~ msgstr "Carpeta"
+
+#~ msgid "Please select a server."
+#~ msgstr "Seleccione un servidor."
+
+#~ msgid "No server has been selected"
+#~ msgstr "No se ha seleccionado ningún servidor"
+
+#~ msgid "Default height of the subscribe dialog."
+#~ msgstr "Altura predeterminada del diálogo de suscripción."
+
+#~ msgid "Default width of the subscribe dialog."
+#~ msgstr "Anchura predeterminada del diálogo de suscripción."
+
+#~ msgid "Subscribe dialog default height"
+#~ msgstr "Altura predeterminada del diálogo de suscripción"
+
+#~ msgid "Subscribe dialog default width"
+#~ msgstr "Anchura predeterminada del diálogo de suscripción"
+
+#~ msgid "(Not Recommended)"
+#~ msgstr "(No recomendado)"
+
+#~ msgid "(Note: Requires restart of the application)"
+#~ msgstr "(Nota: Requiere reiniciar la aplicación)"
+
+#~ msgid "Checks incoming mail messages to be Junk"
+#~ msgstr "Comprueba si los mensajes de correo entrantes son SPAM"
+
+#~ msgid "Do not display messages when text si_ze exceeds"
+#~ msgstr "No mostrar mensajes si el tama_ño del texto excede"
+
+#~ msgid "Enable Magic S_pacebar"
+#~ msgstr "Activar la barra e_spaciadora mágica"
+
+#~ msgid "Enable Sea_rch Folders"
+#~ msgstr "Activar las Carpetas de _búsqueda"
+
+#~ msgid "Fi_xed-width:"
+#~ msgstr "Anchura _fija:"
+
+#~ msgid "Font Properties"
+#~ msgstr "Propiedades de tipografías"
+
+#~ msgid "KB"
+#~ msgstr "Kib"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Tipografías del mensaje"
+
+#~ 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"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Tipografías imprimidas"
+
+#~ msgid "Prompt when sending replies to _many recipients"
+#~ msgstr "Preguntar al enviar mensajes con _muchos destinatarios"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Seleccionar la carpeta de borradores"
+
+#~ msgid "Select HTML fixed width font for printing"
+#~ msgstr "Selecciona letra de anchura fija en HTML para imprimir"
+
+#~ msgid "Select HTML variable width font for printing"
+#~ msgstr "Selecciona letra de anchura variable en HTML para imprimir"
+
+#~ msgid "Select Junk Folder"
+#~ msgstr "Seleccionar carpeta de SPAM"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "Seleccionar la carpeta de enviados"
+
+#~ msgid "Select Trash Folder"
+#~ msgstr "Seleccionar la carpeta de papelera"
+
+#~ msgid "Sending Mail"
+#~ msgstr "Envío de correo"
+
+#~ msgid "Sent and Draft Messages"
+#~ msgstr "Mensajes enviados y borradores"
+
+#~ msgid "Top Posting Option"
+#~ msgstr "Opción de publicar por encima"
+
+#~ msgid "V_ariable-width:"
+#~ msgstr "An_chura variable:"
+
+#~ msgid "_Mark messages as read after"
+#~ msgstr "_Marcar mensajes como leídos tras"
+
+#~ msgid "_Show image animations"
+#~ msgstr "_Mostrar animaciones"
+
+#~ msgid "_Shrink To / Cc / Bcc headers to "
+#~ msgstr "_Reducir las cabeceras Para / Cc / Cco a "
+
+#~ msgid "addresses"
+#~ msgstr "direcciones"
+
+#~ msgid "S_erver:"
+#~ msgstr "S_ervidor:"
+
+#~ msgid "Saving attachment"
+#~ msgstr "Guardando adjunto"
+
+#~ msgid ""
+#~ "Cannot create output file: %s:\n"
+#~ " %s"
+#~ msgstr ""
+#~ "No es posible crear el archivo de salida: %s:\n"
+#~ " %s"
+
+#~ msgid "Could not write data: "
+#~ msgstr "No se pudieron escribir los datos: "
+
+#~ msgid "_Backup Evolution Settings..."
+#~ msgstr "_Respaldar ajustes de Evolution…"
+
+#~ msgid "R_estore Evolution Settings..."
+#~ msgstr "R_estaurar ajustes de Evolution…"
+
+#~ msgid "_Sharing"
+#~ msgstr "_Compartir"
+
+#~ msgid "Manage your Evolution plugins."
+#~ msgstr "Gestionar sus complementos de Evolution"
+
+#~ msgid "Sort mail message threads by subject."
+#~ msgstr "Ordenar conversaciones de mensajes de correo por asunto."
+
+#~ msgid "Subject Threading"
+#~ msgstr "Agrupación según el asunto"
+
+#~ msgid "Thread messages by subject"
+#~ msgstr "Agrupar mensajes según el asunto"
+
 #~ msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
 #~ msgstr "<span size=\"large\" weight=\"bold\">Detalles:</span>"
 
@@ -24527,9 +24733,6 @@ msgstr "Métodos de entrada"
 #~ msgid "Copy Tool"
 #~ msgstr "Herramienta de copia"
 
-#~ msgid "_Account:"
-#~ msgstr "_Cuenta:"
-
 #~ msgid "_Folder Name:"
 #~ msgstr "Nombre de la _carpeta:"