[evolution] Updated Spanish translation



commit 023c86423ced0e78f97786650720afa4958c15a7
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Tue Feb 7 17:58:27 2012 +0100

    Updated Spanish translation

 po/es.po |10769 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 5385 insertions(+), 5384 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index cc7f8c6..891c5ab 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: evolution.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-02-01 14:34+0000\n"
-"PO-Revision-Date: 2012-02-01 17:39+0100\n"
+"POT-Creation-Date: 2012-02-07 13:37+0000\n"
+"PO-Revision-Date: 2012-02-07 17:22+0100\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: EspaÃol <gnome-es-list gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -28,203 +28,212 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:1
+msgid "This address book could not be opened."
+msgstr "No se pudo abrir la libreta de direcciones."
+
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr ""
-"Â{0}Â es una libreta de direcciones de sÃlo lectura y no se puede modificar. "
-"Seleccione una libreta de direcciones diferente de la barra lateral en la "
-"vista de contactos."
+"Este servidor de libretas de direcciones quizà no se pueda alcanzar o el "
+"nombre del servidor podrÃa estar mal escrito o su conexiÃn de red quizà està "
+"caÃda."
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"Ya existe un contacto con esa direcciÃn. ÂQuiere aÃadir una tarjeta nueva "
-"con la misma direcciÃn de todas formas?"
+msgid "Failed to authenticate with LDAP server."
+msgstr "No es posible autenticar con el servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
-"to add it anyway?"
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
 msgstr ""
-"Ya existe un contacto de nombre Â{0}Â en la lista de contactos. ÂQuiere "
-"aÃadirlo de todos modos?"
+"Verifique que su contraseÃa està escrita correctamente y que està usando un "
+"mÃtodo de inicio de sesiÃn soportado. Recuerde que muchas contraseÃas "
+"distinguen las mayÃsculas, su tecla de bloqueo de mayÃsculas puede estar "
+"activada."
 
 #: ../addressbook/addressbook.error.xml.h:5
-msgid "Add with duplicates"
-msgstr "AÃadir con duplicados"
+msgid "This address book server does not have any suggested search bases."
+msgstr ""
+"Este servidor de libretas de direcciones no tiene ninguna de las bases de "
+"bÃsqueda sugeridas."
 
 #: ../addressbook/addressbook.error.xml.h:6
-msgid "Address '{0}' already exists."
-msgstr "La direcciÃn Â{0}Â ya existe."
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"Este servidor LDAP quizà use una versiÃn de LDAP mÃs antigua, la cual no "
+"soporta esta funcionalidad o quizà està mal configurado. Pida a su "
+"administrador de sistema las bases de bÃsqueda soportadas."
 
 #: ../addressbook/addressbook.error.xml.h:7
-msgid "Cannot add new contact"
-msgstr "No se puede aÃadir un contacto nuevo"
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Este servidor no soporta el esquema de informaciÃn LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Cannot move contact."
-msgstr "El contacto no se puede mover."
+msgid "Could not get schema information for LDAP server."
+msgstr "No es posible obtener el esquema de informaciÃn del servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:9
-msgid "Category editor not available."
-msgstr "No hay un editor de categorÃas disponible."
+msgid "LDAP server did not respond with valid schema information."
+msgstr "El servidor LDAP no respondià con una informaciÃn del esquema vÃlida."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Verifique que su contraseÃa està escrita correctamente y que està usando un "
-"mÃtodo de inicio de sesiÃn soportado. Recuerde que muchas contraseÃas "
-"distinguen las mayÃsculas, su tecla de bloqueo de mayÃsculas puede estar "
-"activada."
+msgid "Could not remove address book."
+msgstr "No se pudo eliminar la libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid "Could not get schema information for LDAP server."
-msgstr "No es posible obtener el esquema de informaciÃn del servidor LDAP."
+msgid "Delete address book '{0}'?"
+msgstr "ÂQuiere eliminar la libreta de direcciones Â{0}Â?"
 
 #: ../addressbook/addressbook.error.xml.h:12
-msgid "Could not remove address book."
-msgstr "No se pudo eliminar la libreta de direcciones."
+msgid "This address book will be removed permanently."
+msgstr "Esta libreta de direcciones se eliminarà para siempre."
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"Actualmente sÃlo puede acceder a la libreta de direcciones del sistema de "
-"GroupWise desde Evolution. Use algÃn cliente de correo de GroupWise una sola "
-"vez para obtener sus Contactos frecuentes de GroupWise y las carpetas "
-"personales de contactos de GroupWise."
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+msgid "Do _Not Delete"
+msgstr "_No eliminar"
 
 #: ../addressbook/addressbook.error.xml.h:14
-msgid "Delete address book '{0}'?"
-msgstr "ÂQuiere eliminar la libreta de direcciones Â{0}Â?"
+msgid "Category editor not available."
+msgstr "No hay un editor de categorÃas disponible."
 
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../calendar/calendar.error.xml.h:37 ../mail/mail.error.xml.h:44
-msgid "Do _Not Delete"
-msgstr "_No eliminar"
+msgid "Unable to open address book"
+msgstr "No se puede abrir la libreta de direcciones"
 
 #: ../addressbook/addressbook.error.xml.h:16
-msgid "Error saving {0} to {1}: {2}"
-msgstr "Error al guardar {0} a {1}: {2}"
+msgid "Unable to perform search."
+msgstr "No se puede efectuar la bÃsqueda."
 
 #: ../addressbook/addressbook.error.xml.h:17
-msgid "Failed to authenticate with LDAP server."
-msgstr "No es posible autenticar con el servidor LDAP."
+msgid "Would you like to save your changes?"
+msgstr "ÂQuiere guardar los cambios?"
 
 #: ../addressbook/addressbook.error.xml.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
-msgid "Failed to delete contact"
-msgstr "Fallà al eliminar el contacto"
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr "Ha modificado este contacto. ÂDesea guardar estos cambios?"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "GroupWise Address book creation:"
-msgstr "CreaciÃn de libreta de direcciones GroupWise:"
+msgid "_Discard"
+msgstr "_Descartar"
 
 #: ../addressbook/addressbook.error.xml.h:20
-msgid "LDAP server did not respond with valid schema information."
-msgstr "El servidor LDAP no respondià con una informaciÃn del esquema vÃlida."
+msgid "Cannot move contact."
+msgstr "El contacto no se puede mover."
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "List '{0}' is already in this contact list."
-msgstr "La lsta Â{0} ya està en esta lista de contactos."
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Està moviendo un contacto desde una libreta a otra, pero no puede ser "
+"eliminado de la de origen. ÂQuiere guardar una copia en vez de mover?"
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid "Skip duplicates"
-msgstr "Omitir duplicados"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"La imagen que ha seleccionado es grande. ÂQuiere redimensionarla y "
+"almacenarla?"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid "Some addresses already exist in this contact list."
-msgstr "Algunas direcciones ya existen en esta lista de contactos."
+msgid "_Resize"
+msgstr "_Redimensionar"
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "Some features may not work properly with your current server"
-msgstr ""
-"Algunas caracterÃsticas quizà no funcionen apropiadamente con su servidor "
-"actual"
+msgid "_Use as it is"
+msgstr "_Usar tal cual es"
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "The Evolution address book has quit unexpectedly."
-msgstr "La libreta de direcciones de Evolution ha terminado inesperadamente."
+msgid "_Do not save"
+msgstr "_No guardar"
 
 #: ../addressbook/addressbook.error.xml.h:26
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"La imagen que ha seleccionado es grande. ÂQuiere redimensionarla y "
-"almacenarla?"
+msgid "Unable to save {0}."
+msgstr "No se puede guardar {0}."
 
 #: ../addressbook/addressbook.error.xml.h:27
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"Este servidor LDAP quizà use una versiÃn de LDAP mÃs antigua, la cual no "
-"soporta esta funcionalidad o quizà està mal configurado. Pida a su "
-"administrador de sistema las bases de bÃsqueda soportadas."
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Error al guardar {0} a {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:28
-msgid "This address book could not be opened."
-msgstr "No se pudo abrir la libreta de direcciones."
-
-#: ../addressbook/addressbook.error.xml.h:29
-msgid "This address book server does not have any suggested search bases."
-msgstr ""
-"Este servidor de libretas de direcciones no tiene ninguna de las bases de "
-"bÃsqueda sugeridas."
+msgid "The Evolution address book has quit unexpectedly."
+msgstr "La libreta de direcciones de Evolution ha terminado inesperadamente."
 
+#. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:30
 msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
-"Este servidor de libretas de direcciones quizà no se pueda alcanzar o el "
-"nombre del servidor podrÃa estar mal escrito o su conexiÃn de red quizà està "
-"caÃda."
+"Los contactos para {0} no estarÃn disponibles hasta que Evolution se "
+"reinicie."
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid "This address book will be removed permanently."
-msgstr "Esta libreta de direcciones se eliminarà para siempre."
+msgid "Address '{0}' already exists."
+msgstr "La direcciÃn Â{0}Â ya existe."
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "This server does not support LDAPv3 schema information."
-msgstr "Este servidor no soporta el esquema de informaciÃn LDAPv3."
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"Ya existe un contacto con esa direcciÃn. ÂQuiere aÃadir una tarjeta nueva "
+"con la misma direcciÃn de todas formas?"
 
-#: ../addressbook/addressbook.error.xml.h:33
-msgid "Unable to open address book"
-msgstr "No se puede abrir la libreta de direcciones"
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:597
+#: ../widgets/table/e-table-config.ui.h:6
+msgid "_Add"
+msgstr "_AÃadir"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid "Unable to perform search."
-msgstr "No se puede efectuar la bÃsqueda."
+msgid "Some addresses already exist in this contact list."
+msgstr "Algunas direcciones ya existen en esta lista de contactos."
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid "Unable to save {0}."
-msgstr "No se puede guardar {0}."
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"Està intentando aÃadir direcciones que ya son parte de esta lista. ÂQuiere "
+"aÃadirlas de todos modos?"
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid "Would you like to save your changes?"
-msgstr "ÂQuiere guardar los cambios?"
+msgid "Skip duplicates"
+msgstr "Omitir duplicados"
 
 #: ../addressbook/addressbook.error.xml.h:37
+msgid "Add with duplicates"
+msgstr "AÃadir con duplicados"
+
+#: ../addressbook/addressbook.error.xml.h:38
+msgid "List '{0}' is already in this contact list."
+msgstr "La lsta Â{0} ya està en esta lista de contactos."
+
+#: ../addressbook/addressbook.error.xml.h:39
 msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
 msgstr ""
-"Està moviendo un contacto desde una libreta a otra, pero no puede ser "
-"eliminado de la de origen. ÂQuiere guardar una copia en vez de mover?"
+"Ya existe un contacto de nombre Â{0}Â en la lista de contactos. ÂQuiere "
+"aÃadirlo de todos modos?"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "Some features may not work properly with your current server"
+msgstr ""
+"Algunas caracterÃsticas quizà no funcionen apropiadamente con su servidor "
+"actual"
+
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -234,295 +243,286 @@ msgstr ""
 "problemas usando Evolution. Para los mejores resultados el servidor deberÃa "
 "actualizarse a una versiÃn soportada"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "GroupWise Address book creation:"
+msgstr "CreaciÃn de libreta de direcciones GroupWise:"
+
+#: ../addressbook/addressbook.error.xml.h:43
 msgid ""
-"You are trying to add addresses that are part of this list already. Would "
-"you like to add them anyway?"
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
-"Està intentando aÃadir direcciones que ya son parte de esta lista. ÂQuiere "
-"aÃadirlas de todos modos?"
-
-#: ../addressbook/addressbook.error.xml.h:40
-msgid "You do not have permission to delete contacts in this address book."
-msgstr ""
-"No tiene permisos para eliminar este contacto en esta Libreta de direcciones."
-
-#: ../addressbook/addressbook.error.xml.h:41
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-msgstr "Ha modificado este contacto. ÂDesea guardar estos cambios?"
-
-#. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:43
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
-"Los contactos para {0} no estarÃn disponibles hasta que Evolution se "
-"reinicie."
+"Actualmente sÃlo puede acceder a la libreta de direcciones del sistema de "
+"GroupWise desde Evolution. Use algÃn cliente de correo de GroupWise una sola "
+"vez para obtener sus Contactos frecuentes de GroupWise y las carpetas "
+"personales de contactos de GroupWise."
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:597
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "_Add"
-msgstr "_AÃadir"
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
+msgid "Failed to delete contact"
+msgstr "Fallà al eliminar el contacto"
 
 #: ../addressbook/addressbook.error.xml.h:45
-msgid "_Discard"
-msgstr "_Descartar"
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+"No tiene permisos para eliminar este contacto en esta Libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:46
-msgid "_Do not save"
-msgstr "_No guardar"
-
-#: ../addressbook/addressbook.error.xml.h:47
-msgid "_Resize"
-msgstr "_Redimensionar"
+msgid "Cannot add new contact"
+msgstr "No se puede aÃadir un contacto nuevo"
 
+#. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:48
-msgid "_Use as it is"
-msgstr "_Usar tal cual es"
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"Â{0}Â es una libreta de direcciones de sÃlo lectura y no se puede modificar. "
+"Seleccione una libreta de direcciones diferente de la barra lateral en la "
+"vista de contactos."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:720
-#: ../calendar/gui/e-calendar-view.c:2068
-msgid "Anniversary"
-msgstr "Aniversario"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
+msgid "Contact Editor"
+msgstr "Editor de contactos"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:719
-#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
-#: ../shell/main.c:133
-msgid "Birthday"
-msgstr "CumpleaÃos"
+msgid "Image"
+msgstr "Imagen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+msgid "Nic_kname:"
+msgstr "Apo_do:"
 
-#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-msgid "Blog:"
-msgstr "Blog:"
+msgid "_File under:"
+msgstr "A_rchivar como:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+msgid "_Where:"
+msgstr "_DÃnde:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorÃasâ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-msgid "Calendar:"
-msgstr "Calendario:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:990
-msgid "Contact"
-msgstr "Contacto"
+msgid "Full _Name..."
+msgstr "_Nombre completoâ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
-msgid "Contact Editor"
-msgstr "Editor de contactos"
+msgid "_Wants to receive HTML mail"
+msgstr "_Quiere recibir el correo como HTML"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/merging/eab-contact-merging.c:392
 #: ../addressbook/gui/widgets/eab-contact-display.c:638
 #: ../addressbook/gui/widgets/eab-contact-display.c:646
 #: ../addressbook/gui/widgets/eab-contact-display.c:1046
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 #: ../smime/lib/e-cert.c:833
 msgid "Email"
 msgstr "Correo-e"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-msgid "Free/Busy:"
-msgstr "Disponibilidad:"
+msgid "Telephone"
+msgstr "TelÃfono"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-msgid "Full _Name..."
-msgstr "_Nombre completoâ"
+msgid "Instant Messaging"
+msgstr "MensajerÃa instantÃnea"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
-#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1351
-#: ../widgets/misc/e-contact-map.c:297
-msgid "Home"
-msgstr "Domicilio"
+#: ../addressbook/importers/evolution-vcard-importer.c:990
+msgid "Contact"
+msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-msgid "Home Page:"
-msgstr "PÃgina personal:"
+msgid "_Home Page:"
+msgstr "_PÃgina personal:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-msgid "Image"
-msgstr "Imagen"
+#: ../calendar/gui/dialogs/event-page.c:714
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../plugins/itip-formatter/itip-view.c:1971
+msgid "_Calendar:"
+msgstr "_Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-msgid "Instant Messaging"
-msgstr "MensajerÃa instantÃnea"
+msgid "_Free/Busy:"
+msgstr "_Disponibilidad:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
-msgid "Job"
-msgstr "Empleo"
+msgid "_Video Chat:"
+msgstr "_Charla por vÃdeo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
-msgid "Mailing Address"
-msgstr "DirecciÃn de correo"
+msgid "Home Page:"
+msgstr "PÃgina personal:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../calendar/gui/dialogs/task-details-page.ui.h:11
-msgid "Miscellaneous"
-msgstr "MiscelÃnea"
+msgid "Calendar:"
+msgstr "Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-msgid "Nic_kname:"
-msgstr "Apo_do:"
+msgid "Free/Busy:"
+msgstr "Disponibilidad:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-msgid "Notes"
-msgstr "Notas"
+msgid "Video Chat:"
+msgstr "Charla por vÃdeo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../addressbook/gui/widgets/eab-contact-display.c:79
-#: ../addressbook/gui/widgets/eab-contact-display.c:412
-#: ../calendar/gui/e-cal-model.c:3449
-msgid "Other"
-msgstr "Otro"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
-msgid "Personal Information"
-msgstr "InformaciÃn personal"
+msgid "_Blog:"
+msgstr "_Blog:"
 
+#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
-msgid "Telephone"
-msgstr "TelÃfono"
+msgid "Blog:"
+msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Video Chat:"
-msgstr "Charla por vÃdeo:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "PÃginas web"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web addresses"
 msgstr "Direcciones web"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "_Profession:"
+msgstr "_ProfesiÃn:"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:699
-#: ../addressbook/gui/widgets/eab-contact-display.c:1348
-#: ../widgets/misc/e-contact-map.c:305
-msgid "Work"
-msgstr "Trabajo"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+msgid "_Title:"
+msgstr "_Tratamiento:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
-msgid "_Address:"
-msgstr "_DirecciÃn:"
+msgid "_Company:"
+msgstr "_Empresa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
-msgid "_Anniversary:"
-msgstr "_Aniversario:"
+msgid "_Department:"
+msgstr "_Departamento:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-msgid "_Assistant:"
-msgstr "_SecretarÃa:"
+msgid "_Manager:"
+msgstr "_Jefe:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
-msgid "_Birthday:"
-msgstr "_CumpleaÃos:"
+msgid "_Assistant:"
+msgstr "_SecretarÃa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-msgid "_Blog:"
-msgstr "_Blog:"
+msgid "Job"
+msgstr "Empleo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:714
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-#: ../plugins/itip-formatter/itip-view.c:1971
-msgid "_Calendar:"
-msgstr "_Calendario:"
+msgid "_Office:"
+msgstr "_Oficina:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
-msgid "_City:"
-msgstr "_Ciudad:"
+msgid "_Spouse:"
+msgstr "_CÃnyuge:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
-msgid "_Company:"
-msgstr "_Empresa:"
+msgid "_Birthday:"
+msgstr "_CumpleaÃos:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
-msgid "_Country:"
-msgstr "_PaÃs:"
+msgid "_Anniversary:"
+msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-msgid "_Department:"
-msgstr "_Departamento:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:720
+#: ../calendar/gui/e-calendar-view.c:2068
+msgid "Anniversary"
+msgstr "Aniversario"
 
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-msgid "_File under:"
-msgstr "A_rchivar como:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:719
+#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
+#: ../shell/main.c:133
+msgid "Birthday"
+msgstr "CumpleaÃos"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-msgid "_Free/Busy:"
-msgstr "_Disponibilidad:"
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+msgid "Miscellaneous"
+msgstr "MiscelÃnea"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
-msgid "_Home Page:"
-msgstr "_PÃgina personal:"
+msgid "Personal Information"
+msgstr "InformaciÃn personal"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
-msgid "_Manager:"
-msgstr "_Jefe:"
+msgid "_City:"
+msgstr "_Ciudad:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
-msgid "_Office:"
-msgstr "_Oficina:"
+msgid "_Zip/Postal Code:"
+msgstr "_CÃdigo postal:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
-msgid "_PO Box:"
-msgstr "_Apdo. de correos:"
+msgid "_State/Province:"
+msgstr "E_stado/Provincia:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
-msgid "_Profession:"
-msgstr "_ProfesiÃn:"
+msgid "_Country:"
+msgstr "_PaÃs:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
-msgid "_Spouse:"
-msgstr "_CÃnyuge:"
+msgid "_PO Box:"
+msgstr "_Apdo. de correos:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
-msgid "_State/Province:"
-msgstr "E_stado/Provincia:"
+msgid "_Address:"
+msgstr "_DirecciÃn:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
-msgid "_Title:"
-msgstr "_Tratamiento:"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1351
+#: ../widgets/misc/e-contact-map.c:297
+msgid "Home"
+msgstr "Domicilio"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-msgid "_Video Chat:"
-msgstr "_Charla por vÃdeo:"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-display.c:1348
+#: ../widgets/misc/e-contact-map.c:305
+msgid "Work"
+msgstr "Trabajo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-msgid "_Wants to receive HTML mail"
-msgstr "_Quiere recibir el correo como HTML"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:412
+#: ../calendar/gui/e-cal-model.c:3449
+msgid "Other"
+msgstr "Otro"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-msgid "_Where:"
-msgstr "_DÃnde:"
+msgid "Mailing Address"
+msgstr "DirecciÃn de correo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
-msgid "_Zip/Postal Code:"
-msgstr "_CÃdigo postal:"
+msgid "Notes"
+msgstr "Notas"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
@@ -645,67 +645,67 @@ msgid "_Select Address Book"
 msgstr "_Seleccionar la libreta de direcciones"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid "Mr."
+msgstr "Sr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:2
-msgid "Esq."
-msgstr "Esq."
+msgid "Mrs."
+msgstr "Sra."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Full Name"
-msgstr "Nombre completo"
+msgid "Ms."
+msgstr "Sta."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:4
-msgid "I"
-msgstr "I"
+msgid "Miss"
+msgstr "Srta."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:5
-msgid "II"
-msgstr "II"
+msgid "Dr."
+msgstr "Dr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:6
-msgid "III"
-msgstr "III"
+msgid "Sr."
+msgstr "Sr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "Hijo"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:8
-msgid "Miss"
-msgstr "Srta."
+msgid "I"
+msgstr "I"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:9
-msgid "Mr."
-msgstr "Sr."
+msgid "II"
+msgstr "II"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:10
-msgid "Mrs."
-msgstr "Sra."
+msgid "III"
+msgstr "III"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:11
-msgid "Ms."
-msgstr "Sta."
+msgid "Esq."
+msgstr "Esq."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:12
-msgid "Sr."
-msgstr "Sr."
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Full Name"
+msgstr "Nombre completo"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "_Nombre:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
-msgid "_Last:"
-msgstr "_Apellidos:"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_2Â Nombre:"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:16
+msgid "_Last:"
+msgstr "_Apellidos:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Suffix:"
 msgstr "_Sufijo:"
 
@@ -715,27 +715,27 @@ msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "_List name:"
+msgstr "_Nombre de la lista:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "Members"
 msgstr "Miembros"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+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/contact-list-editor.ui.h:6
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ocultar direcciones al enviar correo-e a esta lista"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
-msgid "_List name:"
-msgstr "_Nombre de la lista:"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:175
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+#: ../mail/mail-config.ui.h:156
 msgid "_Select..."
 msgstr "_Seleccionarâ"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
-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:885
 msgid "Contact List Members"
 msgstr "Miembros de la lista de contactos"
@@ -757,20 +757,11 @@ msgid "Error removing list"
 msgstr "Error al eliminar la lista"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-msgid "Changed Contact:"
-msgstr "Contacto modificado:"
-
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
-msgid "Conflicting Contact:"
-msgstr "Contacto en conflicto:"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Se ha detectado un contacto duplicado"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid ""
 "The name or email of this contact already exists in this folder. Would you "
 "like to save the changes anyway?"
@@ -778,15 +769,21 @@ msgstr ""
 "El nombre o la direcciÃn de correo-e de este contacto ya existe en esta "
 "carpeta. ÂQuiere guardar los cambios de todos modos?"
 
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+msgid "Conflicting Contact:"
+msgstr "Contacto en conflicto:"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+msgid "Changed Contact:"
+msgstr "Contacto modificado:"
+
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-msgid "New Contact:"
-msgstr "Contacto nuevo:"
+#: ../addressbook/gui/merging/eab-contact-merging.c:338
+msgid "_Merge"
+msgstr "Co_mbinar"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
-msgid "Original Contact:"
-msgstr "Contacto original:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -794,24 +791,22 @@ msgstr ""
 "El nombre o la direcciÃn de correo-e de este contacto ya existe\n"
 "en esta carpeta. ÂQuiere aÃadirlo de todos modos?"
 
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
+msgid "Original Contact:"
+msgstr "Contacto original:"
+
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:338
-msgid "_Merge"
-msgstr "Co_mbinar"
+msgid "New Contact:"
+msgstr "Contacto nuevo:"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:320
 msgid "Merge Contact"
 msgstr "Combinar contacto"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:1063
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
-msgid "Any field contains"
-msgstr "Cualquier campo contiene"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+msgid "Name contains"
+msgstr "El nombre contiene"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
 #: ../modules/addressbook/e-book-shell-view-actions.c:1070
@@ -819,9 +814,14 @@ msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:1077
-msgid "Name contains"
-msgstr "El nombre contiene"
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1063
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
+msgid "Any field contains"
+msgstr "Cualquier campo contiene"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:97
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:106
@@ -858,12 +858,12 @@ msgid "List Members:"
 msgstr "Listar miembros:"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:653
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Apodo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:685
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Empresa"
 
@@ -880,12 +880,12 @@ msgid "Position"
 msgstr "PosiciÃn"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:689
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Jefe"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:690
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Secretario"
 
@@ -899,7 +899,7 @@ msgstr "Charla por vÃdeo"
 #: ../modules/calendar/e-cal-shell-view-actions.c:261
 #: ../modules/calendar/e-cal-shell-view.c:528
 #: ../modules/online-accounts/e-online-accounts-google.c:302
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
 msgstr "Calendario"
@@ -907,7 +907,7 @@ msgstr "Calendario"
 #: ../addressbook/gui/widgets/eab-contact-display.c:693
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
@@ -934,12 +934,12 @@ msgid "Web Log"
 msgstr "Diario web"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:717
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "TelÃfono mÃvil"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:721
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "CÃnyuge"
 
@@ -961,7 +961,7 @@ msgid "Personal"
 msgstr "Privado"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:744
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Nota"
 
@@ -1197,111 +1197,93 @@ msgstr "_No mostrar"
 msgid "Display _All Contacts"
 msgstr "Mostrar t_odos los contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "TelÃfono del secretario"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "File As"
+msgstr "Archivar como"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Fax del trabajo"
+msgid "Given Name"
+msgstr "Nombre dado"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Family Name"
+msgstr "Apellidos"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Email 2"
+msgstr "Correo-e 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Email 3"
+msgstr "Correo-e 3"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Assistant Phone"
+msgstr "TelÃfono del secretario"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Business Phone"
 msgstr "TelÃfono del trabajo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Business Phone 2"
 msgstr "TelÃfono del trabajo 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Business Fax"
+msgstr "Fax del trabajo"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Callback Phone"
 msgstr "TelÃfono de devoluciÃn de llamadas"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Car Phone"
 msgstr "TelÃfono del coche"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.etspec.h:1
-msgid "Categories"
-msgstr "CategorÃas"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Company Phone"
 msgstr "TelÃfono de empresa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 2"
-msgstr "Correo-e 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Email 3"
-msgstr "Correo-e 3"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "Family Name"
-msgstr "Apellidos"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
-msgid "File As"
-msgstr "Archivar como"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Home Phone"
+msgstr "TelÃfono de casa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Given Name"
-msgstr "Nombre dado"
+msgid "Home Phone 2"
+msgstr "TelÃfono de casa 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Fax de casa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone"
-msgstr "TelÃfono de casa"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Home Phone 2"
-msgstr "TelÃfono de casa 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "TelÃfono RDSI"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Journal"
-msgstr "Diario"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Oficina"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Other Phone"
+msgstr "Otro telÃfono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Other Fax"
 msgstr "Otro fax"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Otro telÃfono"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Primary Phone"
 msgstr "TelÃfono principal"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:638
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Papel"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Telex"
+msgstr "TÃlex"
 
 #. Translators: This is a vcard standard and stands for the type of
 #. phone used by the hearing impaired. TTY stands for "teletype"
@@ -1309,26 +1291,44 @@ msgstr "Papel"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 msgid "TTYTDD"
 msgstr "TTY/TDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
-msgid "Telex"
-msgstr "TÃlex"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "Unit"
+msgstr "Unidad"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Oficina"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Tratamiento"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Unit"
-msgstr "Unidad"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: ../calendar/gui/e-meeting-list-view.c:638
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Role"
+msgstr "Papel"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Sitio web"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Journal"
+msgstr "Diario"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Categories"
+msgstr "CategorÃas"
+
 #: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "Abrir"
@@ -1440,7 +1440,7 @@ msgstr "Vista de la tarjeta"
 #: ../addressbook/importers/evolution-vcard-importer.c:280
 #: ../calendar/importers/icalendar-importer.c:413
 #: ../calendar/importers/icalendar-importer.c:903
-#: ../calendar/importers/icalendar-importer.c:942 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:942 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Importandoâ"
 
@@ -1609,60 +1609,60 @@ msgid "Appointments"
 msgstr "Citas"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:2
-msgid "Dismiss _All"
-msgstr "Descartar _todo"
+msgid "_Snooze"
+msgstr "_Posponer"
 
-#. Location
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/alarm-notify/alarm-queue.c:1756
-#: ../calendar/alarm-notify/alarm-queue.c:1766
-#: ../plugins/itip-formatter/itip-view.c:1052
-msgid "Location:"
-msgstr "Lugar:"
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3 ../e-util/e-alert-dialog.c:160
+msgid "_Dismiss"
+msgstr "_Descartar"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "_Posponer durante:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert-dialog.c:160
-msgid "_Dismiss"
-msgstr "_Descartar"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
-msgid "_Snooze"
-msgstr "_Posponer"
-
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/e-plugin-util.c:454
+#: ../filter/filter.ui.h:8 ../modules/calendar/e-cal-shell-view-actions.c:350
 #: ../plugins/google-account-setup/google-contacts-source.c:387
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "dÃas"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:15
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-plugin-util.c:453
+#: ../filter/filter.ui.h:7
 #: ../plugins/google-account-setup/google-contacts-source.c:386
 msgid "hours"
 msgstr "horas"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-msgid "location of appointment"
-msgstr "lugar de la cita"
-
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/e-plugin-util.c:452
+#: ../filter/filter.ui.h:6 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/google-account-setup/google-contacts-source.c:385
 msgid "minutes"
 msgstr "minutos"
 
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+msgid "location of appointment"
+msgstr "lugar de la cita"
+
+#. Location
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/alarm-notify/alarm-queue.c:1756
+#: ../calendar/alarm-notify/alarm-queue.c:1766
+#: ../plugins/itip-formatter/itip-view.c:1052
+msgid "Location:"
+msgstr "Lugar:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+msgid "Dismiss _All"
+msgstr "Descartar _todo"
+
 #: ../calendar/alarm-notify/alarm-queue.c:1605
 #: ../calendar/alarm-notify/alarm-queue.c:1737
 msgid "No summary available."
@@ -1755,260 +1755,258 @@ msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:1
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr ""
+"ÂQuiere enviar a todos los participantes una notificaciÃn de cancelaciÃn?"
+
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' does not support assigned tasks, please select a different task list."
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr ""
-"Â{0}Â no soporta asignaciÃn de tareas, seleccione una lista de tareas "
-"diferentes."
+"Si no envÃa una notificaciÃn de cancelaciÃn, los otros participantes quizà "
+"no sepan que la reuniÃn se ha cancelado."
+
+#: ../calendar/calendar.error.xml.h:3
+msgid "Do _not Send"
+msgstr "_No enviar"
 
-#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"Â{0}Â es un calendario de sÃlo lectura y no se puede modificar. Seleccione un "
-"calendario diferente de la barra lateral en la vista del calendario."
+msgid "_Send Notice"
+msgstr "_Enviar notificaciÃn"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:6
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
-msgstr ""
-"Â{0}Â es calendario de sÃlo lectura y no se puede modificar. Seleccione un "
-"calendario diferente que pueda aceptar citas."
+#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/gui/dialogs/delete-comp.c:189
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "ÂSeguro que quiere eliminar esta reuniÃn?"
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
-"AÃadir un resumen con sentido a su cita darà a sus destinatarios una idea de "
-"quà trata su cita."
+"Toda la informaciÃn acerca de esta reuniÃn se eliminarà y no se podrà "
+"recuperar."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr ""
-"AÃadir un resumen con sentido a su tarea darà a sus destinatarios una idea "
-"de quà trata su tarea."
+"Si no envÃa una notificaciÃn de cancelaciÃn, los otros participantes quizà "
+"no sepan que la tarea ha sido borrada."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
-"Toda la informaciÃn de estas notas se eliminarà y no se podrà recuperar."
+#: ../calendar/gui/dialogs/delete-comp.c:192
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "ÂSeguro que quiere eliminar esta tarea?"
 
 #: ../calendar/calendar.error.xml.h:10
-msgid "All information in this memo will be deleted and can not be restored."
-msgstr "Toda la informaciÃn en esta nota se eliminarà y no se podrà recuperar."
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+"Toda la informaciÃn acerca de esta tarea se eliminarà y no se podrà "
+"recuperar."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"Toda la informaciÃn de estas citas se eliminarà y no se podrà recuperar."
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "ÂQuiere enviar una notificaciÃn de cancelaciÃn para esta nota?"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on these tasks will be deleted and can not be restored."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
 msgstr ""
-"Toda la informaciÃn de estas tareas se eliminarà y no se podrà recuperar."
+"Si no envÃa una notificaciÃn de cancelaciÃn, los otros participantes quizà "
+"no sepan que la nota se ha borrado."
 
 #: ../calendar/calendar.error.xml.h:13
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr "Toda la informaciÃn de esta cita se eliminarà y no se podrà recuperar."
+#: ../calendar/gui/dialogs/delete-comp.c:195
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "ÂSeguro que quiere eliminar esta nota?"
 
 #: ../calendar/calendar.error.xml.h:14
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr ""
-"Toda la informaciÃn acerca de esta reuniÃn se eliminarà y no se podrà "
-"recuperar."
-
-#: ../calendar/calendar.error.xml.h:15
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "Toda la informaciÃn acerca de esta nota se eliminarà y no se podrà recuperar."
 
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "ÂSeguro que quiere eliminar la reuniÃn titulada Â{0}Â?"
+
 #: ../calendar/calendar.error.xml.h:16
-msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
-"Toda la informaciÃn acerca de esta tarea se eliminarà y no se podrà "
-"recuperar."
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "ÂSeguro que quiere eliminar la cita titulada Â{0}Â?"
 
 #: ../calendar/calendar.error.xml.h:17
-msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "ÂSeguro que quiere eliminar la tarea Â{0}Â?"
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr "Toda la informaciÃn de esta cita se eliminarà y no se podrà recuperar."
 
 #: ../calendar/calendar.error.xml.h:18
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "ÂSeguro que quiere eliminar la cita titulada Â{0}Â?"
+msgid "Are you sure you want to delete this appointment?"
+msgstr "ÂSeguro que quiere eliminar esta cita?"
 
 #: ../calendar/calendar.error.xml.h:19
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "ÂSeguro que quiere eliminar la reuniÃn titulada Â{0}Â?"
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "ÂSeguro que quiere eliminar la tarea Â{0}Â?"
 
 #: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "ÂSeguro que quiere eliminar la nota Â{0}Â?"
 
 #: ../calendar/calendar.error.xml.h:21
-msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "ÂSeguro que quiere eliminar estas {0} citas?"
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "Toda la informaciÃn en esta nota se eliminarà y no se podrà recuperar."
 
 #: ../calendar/calendar.error.xml.h:22
-msgid "Are you sure you want to delete these {0} memos?"
-msgstr "ÂSeguro que quiere eliminar estas {0} notas?"
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "ÂSeguro que quiere eliminar estas {0} citas?"
 
 #: ../calendar/calendar.error.xml.h:23
-msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "ÂSeguro que quiere eliminar estas {0} tareas?"
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+"Toda la informaciÃn de estas citas se eliminarà y no se podrà recuperar."
 
 #: ../calendar/calendar.error.xml.h:24
-msgid "Are you sure you want to delete this appointment?"
-msgstr "ÂSeguro que quiere eliminar esta cita?"
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "ÂSeguro que quiere eliminar estas {0} tareas?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:189
-#, c-format
-msgid "Are you sure you want to delete this meeting?"
-msgstr "ÂSeguro que quiere eliminar esta reuniÃn?"
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+"Toda la informaciÃn de estas tareas se eliminarà y no se podrà recuperar."
 
 #: ../calendar/calendar.error.xml.h:26
-#: ../calendar/gui/dialogs/delete-comp.c:195
-#, c-format
-msgid "Are you sure you want to delete this memo?"
-msgstr "ÂSeguro que quiere eliminar esta nota?"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "ÂSeguro que quiere eliminar estas {0} notas?"
 
 #: ../calendar/calendar.error.xml.h:27
-#: ../calendar/gui/dialogs/delete-comp.c:192
-#, c-format
-msgid "Are you sure you want to delete this task?"
-msgstr "ÂSeguro que quiere eliminar esta tarea?"
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr ""
+"Toda la informaciÃn de estas notas se eliminarà y no se podrà recuperar."
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to save the appointment without a summary?"
-msgstr "ÂSeguro que quiere guardar la cita sin un resumen?"
+msgid "Would you like to save your changes to this meeting?"
+msgstr "ÂQuiere guardar los cambios de esta reuniÃn?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "ÂSeguro que quiere guardar la nota sin un resumen?"
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "Ha realizado cambios en esta reuniÃn, pero no la ha guardado aÃn."
 
 #: ../calendar/calendar.error.xml.h:30
-msgid "Are you sure you want to save the task without a summary?"
-msgstr "ÂSeguro que quiere guardar la tarea sin un resumen?"
+#: ../composer/mail-composer.error.xml.h:16
+msgid "_Discard Changes"
+msgstr "_Descartar cambios"
 
 #: ../calendar/calendar.error.xml.h:31
-msgid "Cannot create a new event"
-msgstr "No es posible crear un acontecimiento nuevo"
+msgid "_Save Changes"
+msgstr "_Guardar cambios"
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Cannot save event"
-msgstr "No se puede guardar el acontecimiento"
+msgid "Would you like to save your changes to this appointment?"
+msgstr "ÂDesea guardar los cambios de esta cita?"
 
 #: ../calendar/calendar.error.xml.h:33
-msgid "Cannot save task"
-msgstr "No se puede guardar la tarea"
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "Ha cambiado esta cita, pero no la ha guardado aÃn."
 
 #: ../calendar/calendar.error.xml.h:34
-msgid "Delete calendar '{0}'?"
-msgstr "ÂQuiere eliminar el calendario Â{0}Â?"
+msgid "Would you like to save your changes to this task?"
+msgstr "ÂQuiere guardar los cambios de esta tarea?"
 
 #: ../calendar/calendar.error.xml.h:35
-msgid "Delete memo list '{0}'?"
-msgstr "ÂQuiere la lista de notas Â{0}Â?"
+msgid "You have changed this task, but not yet saved it."
+msgstr "Ha realizado cambios en esta tarea, pero no la ha guardado aÃn."
 
 #: ../calendar/calendar.error.xml.h:36
-msgid "Delete task list '{0}'?"
-msgstr "ÂQuiere eliminar la lista de tareas Â{0}Â?"
+msgid "Would you like to save your changes to this memo?"
+msgstr "ÂQuiere guardar los cambios de esta nota?"
+
+#: ../calendar/calendar.error.xml.h:37
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "Ha realizado cambios en esta nota, pero no los ha guardado aÃn."
 
 #: ../calendar/calendar.error.xml.h:38
-msgid "Do _not Send"
-msgstr "_No enviar"
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "ÂQuiere enviar invitaciones a la reuniÃn a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Descarga en progreso. ÂDesea guardar la cita?"
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"Se enviarÃn invitaciones por correo-e a todos los participantes y se les "
+"permitirà responder."
 
 #: ../calendar/calendar.error.xml.h:40
-msgid "Download in progress. Do you want to save the task?"
-msgstr "Descarga en progreso. ÂDesea guardar la tarea?"
+#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Send"
+msgstr "_Enviar"
 
 #: ../calendar/calendar.error.xml.h:41
-msgid "Editor could not be loaded."
-msgstr "No es posible cargar el editor."
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+"ÂQuiere enviar informaciÃn de la reuniÃn actualizada a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
 msgstr ""
-"Se enviarÃn invitaciones por correo-e a todos los participantes y se les "
-"permitirà aceptar esta tarea."
+"Al enviar informaciÃn actualizada permite que otros participantes mantengan "
+"sus calendarios al dÃa."
 
 #: ../calendar/calendar.error.xml.h:43
+msgid "Would you like to send this task to participants?"
+msgstr "ÂQuiere enviar esta tarea a los participantes?"
+
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr ""
 "Se enviarÃn invitaciones por correo-e a todos los participantes y se les "
-"permitirà responder."
-
-#: ../calendar/calendar.error.xml.h:44
-msgid "Error loading calendar"
-msgstr "Error al cargar el calendario"
+"permitirà aceptar esta tarea."
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "Error loading memo list"
-msgstr "Error al cargar la lista de notas"
+msgid "Download in progress. Do you want to save the task?"
+msgstr "Descarga en progreso. ÂDesea guardar la tarea?"
 
 #: ../calendar/calendar.error.xml.h:46
-msgid "Error loading task list"
-msgstr "Error al cargar la lista de tareas"
-
-#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
-#. {1} is replaced with a calendar/task/memo list name, where the error happened
-#: ../calendar/calendar.error.xml.h:49
-msgid "Error on {0}: {1}"
-msgstr "Error en {0}: {1}"
-
-#: ../calendar/calendar.error.xml.h:50
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr ""
-"Si no envÃa una notificaciÃn de cancelaciÃn, los otros participantes quizà "
-"no sepan que la reuniÃn se ha cancelado."
+"Hay algunos adjuntos descargÃndose. Guardar la tarea podrÃa resultar en la "
+"pÃrdida de esos adjuntos."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
-msgstr ""
-"Si no envÃa una notificaciÃn de cancelaciÃn, los otros participantes quizà "
-"no sepan que la nota se ha borrado."
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
+msgid "_Save"
+msgstr "_Guardar"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "Descarga en progreso. ÂDesea guardar la cita?"
+
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr ""
-"Si no envÃa una notificaciÃn de cancelaciÃn, los otros participantes quizà "
-"no sepan que la tarea ha sido borrada."
+"Hay algunos adjuntos descargÃndose. Guardar la cita podrÃa resultar en la "
+"pÃrdida de esos adjuntos."
 
-#: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+#: ../calendar/calendar.error.xml.h:50
+msgid "Would you like to send updated task information to participants?"
 msgstr ""
-"Al enviar informaciÃn actualizada permite que otros participantes mantengan "
-"sus calendarios al dÃa."
+"ÂQuiere enviar informaciÃn actualizada de las tareas a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2016,171 +2014,173 @@ msgstr ""
 "El envÃo de informaciÃn actualizada permite que otros participantes "
 "mantengan su lista de tareas al dÃa."
 
+#: ../calendar/calendar.error.xml.h:52
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "Las tareas de Evolution han terminado inesperadamente."
+
+#: ../calendar/calendar.error.xml.h:53
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr "Sus tareas no estarÃn disponibles hasta que reinicie Evolution."
+
+#: ../calendar/calendar.error.xml.h:54
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "El calendario de Evolution ha terminado inesperadamente."
+
 #: ../calendar/calendar.error.xml.h:55
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"Hay algunos adjuntos descargÃndose. Guardar la cita podrÃa resultar en la "
-"pÃrdida de esos adjuntos."
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr "Sus calendarios no estarÃn disponibles hasta que reinicie Evolution."
 
 #: ../calendar/calendar.error.xml.h:56
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"Hay algunos adjuntos descargÃndose. Guardar la tarea podrÃa resultar en la "
-"pÃrdida de esos adjuntos."
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "Las notas de Evolution han terminado inesperadamente."
 
 #: ../calendar/calendar.error.xml.h:57
-msgid "Some features may not work properly with your current server."
-msgstr ""
-"Algunas caracterÃsticas quizà no funcionen correctamente con su servidor "
-"actual."
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr "Sus notas no estarÃn disponibles hasta que reinicie Evolution."
 
 #: ../calendar/calendar.error.xml.h:58
-msgid "The Evolution calendar has quit unexpectedly."
+msgid "The Evolution calendars have quit unexpectedly."
 msgstr "El calendario de Evolution ha terminado inesperadamente."
 
 #: ../calendar/calendar.error.xml.h:59
-msgid "The Evolution calendars have quit unexpectedly."
-msgstr "El calendario de Evolution ha terminado inesperadamente."
+msgid "Editor could not be loaded."
+msgstr "No es posible cargar el editor."
 
 #: ../calendar/calendar.error.xml.h:60
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "Las notas de Evolution han terminado inesperadamente."
+msgid "Delete calendar '{0}'?"
+msgstr "ÂQuiere eliminar el calendario Â{0}Â?"
 
 #: ../calendar/calendar.error.xml.h:61
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr "Las tareas de Evolution han terminado inesperadamente."
+msgid "This calendar will be removed permanently."
+msgstr "Este calendario se eliminarà permanentemente."
 
 #: ../calendar/calendar.error.xml.h:62
-msgid "The calendar is not marked for offline usage."
-msgstr "El calendario no està marcado para usarse sin conexiÃn."
+msgid "Delete task list '{0}'?"
+msgstr "ÂQuiere eliminar la lista de tareas Â{0}Â?"
 
 #: ../calendar/calendar.error.xml.h:63
-msgid "The memo list is not marked for offline usage."
-msgstr "La lista de notas no està marcada para usarse sin conexiÃn."
+msgid "This task list will be removed permanently."
+msgstr "Esta lista de tareas se eliminarà permanentemente."
 
 #: ../calendar/calendar.error.xml.h:64
-msgid "The task list is not marked for offline usage."
-msgstr "La lista de tareas no està marcada para usarse sin conexiÃn."
+msgid "Delete memo list '{0}'?"
+msgstr "ÂQuiere la lista de notas Â{0}Â?"
 
 #: ../calendar/calendar.error.xml.h:65
-msgid "This calendar will be removed permanently."
-msgstr "Este calendario se eliminarà permanentemente."
-
-#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de notas se eliminarà permanentemente."
 
+#: ../calendar/calendar.error.xml.h:66
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "ÂSeguro que quiere guardar la cita sin un resumen?"
+
 #: ../calendar/calendar.error.xml.h:67
-msgid "This task list will be removed permanently."
-msgstr "Esta lista de tareas se eliminarà permanentemente."
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
+msgstr ""
+"AÃadir un resumen con sentido a su cita darà a sus destinatarios una idea de "
+"quà trata su cita."
 
 #: ../calendar/calendar.error.xml.h:68
-msgid "Would you like to save your changes to this appointment?"
-msgstr "ÂDesea guardar los cambios de esta cita?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "ÂSeguro que quiere guardar la tarea sin un resumen?"
 
 #: ../calendar/calendar.error.xml.h:69
-msgid "Would you like to save your changes to this meeting?"
-msgstr "ÂQuiere guardar los cambios de esta reuniÃn?"
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
+msgstr ""
+"AÃadir un resumen con sentido a su tarea darà a sus destinatarios una idea "
+"de quà trata su tarea."
 
 #: ../calendar/calendar.error.xml.h:70
-msgid "Would you like to save your changes to this memo?"
-msgstr "ÂQuiere guardar los cambios de esta nota?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "ÂSeguro que quiere guardar la nota sin un resumen?"
 
 #: ../calendar/calendar.error.xml.h:71
-msgid "Would you like to save your changes to this task?"
-msgstr "ÂQuiere guardar los cambios de esta tarea?"
+msgid "Error loading calendar"
+msgstr "Error al cargar el calendario"
 
 #: ../calendar/calendar.error.xml.h:72
-msgid "Would you like to send a cancelation notice for this memo?"
-msgstr "ÂQuiere enviar una notificaciÃn de cancelaciÃn para esta nota?"
+msgid "The calendar is not marked for offline usage."
+msgstr "El calendario no està marcado para usarse sin conexiÃn."
 
 #: ../calendar/calendar.error.xml.h:73
-msgid "Would you like to send all the participants a cancelation notice?"
-msgstr ""
-"ÂQuiere enviar a todos los participantes una notificaciÃn de cancelaciÃn?"
-
-#: ../calendar/calendar.error.xml.h:74
-msgid "Would you like to send meeting invitations to participants?"
-msgstr "ÂQuiere enviar invitaciones a la reuniÃn a los participantes?"
+msgid "Cannot create a new event"
+msgstr "No es posible crear un acontecimiento nuevo"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:75
-msgid "Would you like to send this task to participants?"
-msgstr "ÂQuiere enviar esta tarea a los participantes?"
-
-#: ../calendar/calendar.error.xml.h:76
-msgid "Would you like to send updated meeting information to participants?"
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"ÂQuiere enviar informaciÃn de la reuniÃn actualizada a los participantes?"
+"Â{0}Â es un calendario de sÃlo lectura y no se puede modificar. Seleccione un "
+"calendario diferente de la barra lateral en la vista del calendario."
 
-#: ../calendar/calendar.error.xml.h:77
-msgid "Would you like to send updated task information to participants?"
-msgstr ""
-"ÂQuiere enviar informaciÃn actualizada de las tareas a los participantes?"
+#: ../calendar/calendar.error.xml.h:76
+msgid "Cannot save event"
+msgstr "No se puede guardar el acontecimiento"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:78
 msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
-"Està conectando con un servidor GroupWise no soportado y podrÃa encontrar "
-"problemas usando Evolution. Para los mejores resultados el servidor deberÃa "
-"actualizarse a una versiÃn soportada."
+"Â{0}Â es calendario de sÃlo lectura y no se puede modificar. Seleccione un "
+"calendario diferente que pueda aceptar citas."
 
 #: ../calendar/calendar.error.xml.h:79
-msgid "You have changed this appointment, but not yet saved it."
-msgstr "Ha cambiado esta cita, pero no la ha guardado aÃn."
-
-#: ../calendar/calendar.error.xml.h:80
-msgid "You have changed this meeting, but not yet saved it."
-msgstr "Ha realizado cambios en esta reuniÃn, pero no la ha guardado aÃn."
+msgid "Cannot save task"
+msgstr "No se puede guardar la tarea"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:81
-msgid "You have changed this task, but not yet saved it."
-msgstr "Ha realizado cambios en esta tarea, pero no la ha guardado aÃn."
+msgid ""
+"'{0}' does not support assigned tasks, please select a different task list."
+msgstr ""
+"Â{0}Â no soporta asignaciÃn de tareas, seleccione una lista de tareas "
+"diferentes."
 
 #: ../calendar/calendar.error.xml.h:82
-msgid "You have made changes to this memo, but not yet saved them."
-msgstr "Ha realizado cambios en esta nota, pero no los ha guardado aÃn."
+msgid "Error loading task list"
+msgstr "Error al cargar la lista de tareas"
 
 #: ../calendar/calendar.error.xml.h:83
-msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "Sus calendarios no estarÃn disponibles hasta que reinicie Evolution."
+msgid "The task list is not marked for offline usage."
+msgstr "La lista de tareas no està marcada para usarse sin conexiÃn."
 
 #: ../calendar/calendar.error.xml.h:84
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "Sus notas no estarÃn disponibles hasta que reinicie Evolution."
+msgid "Error loading memo list"
+msgstr "Error al cargar la lista de notas"
 
 #: ../calendar/calendar.error.xml.h:85
-msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Sus tareas no estarÃn disponibles hasta que reinicie Evolution."
-
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Descartar cambios"
-
-#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:316
-msgid "_Save"
-msgstr "_Guardar"
+msgid "The memo list is not marked for offline usage."
+msgstr "La lista de notas no està marcada para usarse sin conexiÃn."
 
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
 #: ../calendar/calendar.error.xml.h:88
-msgid "_Save Changes"
-msgstr "_Guardar cambios"
+msgid "Error on {0}: {1}"
+msgstr "Error en {0}: {1}"
 
 #: ../calendar/calendar.error.xml.h:89
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
-msgid "_Send"
-msgstr "_Enviar"
+msgid "Some features may not work properly with your current server."
+msgstr ""
+"Algunas caracterÃsticas quizà no funcionen correctamente con su servidor "
+"actual."
 
 #: ../calendar/calendar.error.xml.h:90
-msgid "_Send Notice"
-msgstr "_Enviar notificaciÃn"
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"Està conectando con un servidor GroupWise no soportado y podrÃa encontrar "
+"problemas usando Evolution. Para los mejores resultados el servidor deberÃa "
+"actualizarse a una versiÃn soportada."
 
 #: ../calendar/gui/calendar-view-factory.c:110
 msgid "Day View"
@@ -2198,141 +2198,140 @@ msgstr "Vista semanal"
 msgid "Month View"
 msgstr "Vista mensual"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:3
-msgid "Any Field"
-msgstr "Cualquier campo"
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:383
+msgid "Summary"
+msgstr "Resumen"
+
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "contiene"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Adjuntos"
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "no contiene"
 
-#: ../calendar/gui/caltypes.xml.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:6
-msgid "Attendee"
-msgstr "Participante"
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+#: ../widgets/misc/e-attachment-tree-view.c:526
+#: ../widgets/table/e-table-config.ui.h:24
+msgid "Description"
+msgstr "DescripciÃn"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:8
-msgid "Category"
-msgstr "CategorÃa"
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Any Field"
+msgstr "Cualquier campo"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:7
 msgid "Classification"
 msgstr "ClasificaciÃn"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:799 ../calendar/gui/e-task-table.c:544
-#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
-msgid "Confidential"
-msgstr "Confidencial"
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:31
+msgid "is"
+msgstr "es"
 
-#: ../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
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
-#: ../widgets/misc/e-attachment-tree-view.c:526
-#: ../widgets/table/e-table-config.ui.h:6
-msgid "Description"
-msgstr "DescripciÃn"
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:37
+msgid "is not"
+msgstr "no es"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:11
-msgid "Description Contains"
-msgstr "La descripciÃn contiene"
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:788 ../calendar/gui/e-cal-model.c:795
+#: ../calendar/gui/e-task-table.c:542 ../calendar/gui/memotypes.xml.h:10
+msgid "Public"
+msgstr "PÃblico"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "No existen"
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:797 ../calendar/gui/e-task-table.c:543
+#: ../calendar/gui/memotypes.xml.h:11
+msgid "Private"
+msgstr "Privado"
 
-#: ../calendar/gui/caltypes.xml.h:11
-msgid "Exactly"
-msgstr "Exactamente"
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:799 ../calendar/gui/e-task-table.c:544
+#: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
+msgid "Confidential"
+msgstr "Confidencial"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existen"
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:5
+msgid "Organizer"
+msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:13
-msgid "Less Than"
-msgstr "Menor que"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "Participante"
 
 #: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
 #: ../plugins/publish-calendar/publish-calendar.c:855
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "Lugar"
 
-#: ../calendar/gui/caltypes.xml.h:15
-msgid "More Than"
-msgstr "MÃs que"
-
-#: ../calendar/gui/caltypes.xml.h:16
-msgid "Occurs"
-msgstr "Sucede"
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Category"
+msgstr "CategorÃa"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Organizer"
-msgstr "Organizador"
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:15 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Adjuntos"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:797 ../calendar/gui/e-task-table.c:543
-#: ../calendar/gui/memotypes.xml.h:12
-msgid "Private"
-msgstr "Privado"
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existen"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:788 ../calendar/gui/e-cal-model.c:795
-#: ../calendar/gui/e-task-table.c:542 ../calendar/gui/memotypes.xml.h:13
-msgid "Public"
-msgstr "PÃblico"
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "No existen"
 
-#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/caltypes.xml.h:19
 #: ../calendar/gui/dialogs/event-editor.c:317
 #: ../calendar/gui/dialogs/event-editor.c:338
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "RepeticiÃn"
 
+#: ../calendar/gui/caltypes.xml.h:20
+msgid "Occurs"
+msgstr "Sucede"
+
 #: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:383
-msgid "Summary"
-msgstr "Resumen"
+msgid "Less Than"
+msgstr "Menor que"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Summary Contains"
-msgstr "El resumen contiene"
+#: ../calendar/gui/caltypes.xml.h:22
+msgid "Exactly"
+msgstr "Exactamente"
 
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "contiene"
+#: ../calendar/gui/caltypes.xml.h:23
+msgid "More Than"
+msgstr "MÃs que"
 
 #: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "no contiene"
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Summary Contains"
+msgstr "El resumen contiene"
 
 #: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
-msgid "is"
-msgstr "es"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
-msgid "is not"
-msgstr "no es"
+#: ../calendar/gui/tasktypes.xml.h:29
+msgid "Description Contains"
+msgstr "La descripciÃn contiene"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:632
 msgid "Edit Reminder"
@@ -2359,105 +2358,105 @@ msgid "Send an email"
 msgstr "Enviar un correo-e"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Reminder"
-msgstr "aÃadir recordatorio"
+msgid "minute(s)"
+msgstr "minuto(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "Custom _message"
-msgstr "_Mensaje personalizado"
+msgid "hour(s)"
+msgstr "hora(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "Custom reminder sound"
-msgstr "Sonido de recordatorio personalizado"
+msgid "day(s)"
+msgstr "dÃa(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Mes_sage:"
-msgstr "_Mensaje:"
+msgid "before"
+msgstr "antes del"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:80
-msgid "Options"
-msgstr "Opciones"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+msgid "after"
+msgstr "despuÃs del"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Reminder"
-msgstr "Recordatorio"
+msgid "start of appointment"
+msgstr "inicio de la cita"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Repeat"
-msgstr "Repetir"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-msgid "Select A File"
-msgstr "Seleccione un archivo"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-msgid "Send To:"
-msgstr "Enviar a:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-msgid "_Arguments:"
-msgstr "_Argumentos:"
+msgid "end of appointment"
+msgstr "fin de la cita"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "_Program:"
-msgstr "_Programa:"
+msgid "Add Reminder"
+msgstr "aÃadir recordatorio"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "_Repetir el recordatorio"
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "Recordatorio"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
-msgid "_Sound:"
-msgstr "_Sonido:"
+msgid "Repeat"
+msgstr "Repetir"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "after"
-msgstr "despuÃs del"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
-msgid "before"
-msgstr "antes del"
+msgid "_Repeat the reminder"
+msgstr "_Repetir el recordatorio"
 
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "day(s)"
-msgstr "dÃa(s)"
+msgid "extra times every"
+msgstr "veces adicionales cada"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:32
+msgid "Options"
+msgstr "Opciones"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "end of appointment"
-msgstr "fin de la cita"
+msgid "Custom _message"
+msgstr "_Mensaje personalizado"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+msgid "Mes_sage:"
+msgstr "_Mensaje:"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "extra times every"
-msgstr "veces adicionales cada"
+msgid "Custom reminder sound"
+msgstr "Sonido de recordatorio personalizado"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "hour(s)"
-msgstr "hora(s)"
+msgid "_Sound:"
+msgstr "_Sonido:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "Select A File"
+msgstr "Seleccione un archivo"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "minute(s)"
-msgstr "minuto(s)"
+msgid "_Program:"
+msgstr "_Programa:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+msgid "_Arguments:"
+msgstr "_Argumentos:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
-msgid "start of appointment"
-msgstr "inicio de la cita"
+msgid "Send To:"
+msgstr "Enviar a:"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "AcciÃn/Disparador"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-msgid "A_dd"
-msgstr "AÃa_dir"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Reminders"
 msgstr "Recordatorios"
 
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+msgid "A_dd"
+msgstr "AÃa_dir"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "Tipo:"
@@ -2467,8 +2466,8 @@ msgstr "Tipo:"
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:262 ../mail/mail-config.ui.h:167
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../calendar/gui/dialogs/calendar-setup.c:262 ../mail/mail-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:12
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
@@ -2502,18 +2501,18 @@ msgstr "Colo_r:"
 #: ../calendar/gui/dialogs/calendar-setup.c:462
 #: ../calendar/gui/dialogs/calendar-setup.c:474
 #: ../calendar/gui/dialogs/calendar-setup.c:485
-#: ../mail/em-folder-properties.c:234 ../mail/mail-config.ui.h:56
+#: ../mail/em-folder-properties.c:254 ../mail/mail-config.ui.h:25
 #: ../modules/addressbook/addressbook-config.c:1082
 #: ../modules/addressbook/autocompletion-config.c:240
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../plugins/itip-formatter/itip-formatter.c:3234
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "General"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:475
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Task List"
 msgstr "Lista de tareas"
 
@@ -2686,9 +2685,9 @@ msgid "_Classification"
 msgstr "_ClasificaciÃn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1199
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
 #: ../mail/e-mail-browser.c:172
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
@@ -2715,7 +2714,7 @@ msgid "_Options"
 msgstr "_Opciones"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1234 ../mail/e-mail-browser.c:179
-#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:46
+#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "_Ver"
 
@@ -2923,16 +2922,16 @@ msgid "The item could not be deleted due to an error: %s"
 msgstr "No se pudo eliminar el elemento debido a un error: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Contacts..."
-msgstr "Contactosâ"
+msgid "Enter Delegate"
+msgstr "Introducir un delegado"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "Delegar en:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-msgid "Enter Delegate"
-msgstr "Introducir un delegado"
+msgid "Contacts..."
+msgstr "Contactosâ"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Reminders"
@@ -2959,7 +2958,7 @@ msgid "Make this a recurring event"
 msgstr "Convertir en acontecimiento repetitivo"
 
 #: ../calendar/gui/dialogs/event-editor.c:240
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Opciones de envÃo"
 
@@ -2989,7 +2988,7 @@ msgid "Appointment"
 msgstr "Cita"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "Participantes"
@@ -3018,8 +3017,8 @@ msgid "This event has reminders"
 msgstr "Este acontecimiento tiene recordatorios."
 
 #: ../calendar/gui/dialogs/event-page.c:722
-#: ../calendar/gui/dialogs/event-page.ui.h:7
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
@@ -3117,136 +3116,136 @@ msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:565
-msgid "Atte_ndees..."
-msgstr "_Participantesâ"
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgctxt "eventpage"
+msgid "for"
+msgstr "durante"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Custom Reminder:"
-msgstr "Recordatorio personalizado:"
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:4
+msgctxt "eventpage"
+msgid "until"
+msgstr "hasta"
 
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Event Description"
-msgstr "DescripciÃn del acontecimiento"
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 minutos antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "Time _zone:"
-msgstr "_Zona horaria:"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 hora antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:347
-msgid "_Description:"
-msgstr "_DescripciÃn:"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "1 dÃa antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "_Lugar:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "_Reminder"
-msgstr "_Recordatorio"
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../widgets/misc/e-attachment-dialog.c:347
+msgid "_Description:"
+msgstr "_DescripciÃn:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Summary:"
-msgstr "_Resumen:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "_Hora:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "1 dÃa antes de la cita"
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Time _zone:"
+msgstr "_Zona horaria:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "1 hora antes de la cita"
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_Resumen:"
 
-#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "15 minutos antes de la cita"
+msgid "Event Description"
+msgstr "DescripciÃn del acontecimiento"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-msgctxt "eventpage"
-msgid "for"
-msgstr "durante"
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../calendar/gui/e-meeting-time-sel.c:565
+msgid "Atte_ndees..."
+msgstr "_Participantesâ"
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:25
-msgctxt "eventpage"
-msgid "until"
-msgstr "hasta"
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+msgid "_Reminder"
+msgstr "_Recordatorio"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+msgid "Custom Reminder:"
+msgstr "Recordatorio personalizado:"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "April"
-msgstr "Abril"
+msgid "January"
+msgstr "Enero"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "August"
-msgstr "Agosto"
+msgid "February"
+msgstr "Febrero"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "December"
-msgstr "Diciembre"
+msgid "March"
+msgstr "Marzo"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "February"
-msgstr "Febrero"
+msgid "April"
+msgstr "Abril"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "January"
-msgstr "Enero"
+msgid "May"
+msgstr "Mayo"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "July"
-msgstr "Julio"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
 msgid "June"
 msgstr "Junio"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "July"
+msgstr "Julio"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "March"
-msgstr "Marzo"
+msgid "August"
+msgstr "Agosto"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "May"
-msgstr "Mayo"
+msgid "September"
+msgstr "Septiembre"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "November"
-msgstr "Noviembre"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
 msgid "October"
 msgstr "Octubre"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "November"
+msgstr "Noviembre"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "December"
+msgstr "Diciembre"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
 msgid "Select Date"
 msgstr "Seleccionar fecha"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
 #: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Select _Today"
 msgstr "Seleccionar _hoy"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-msgid "September"
-msgstr "Septiembre"
-
 #: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3331
 msgid "Memo"
 msgstr "Nota"
@@ -3275,29 +3274,29 @@ msgstr "No es posible abrir las notas en Â%sÂ: %s"
 #: ../calendar/gui/dialogs/memo-page.c:1154 ../em-format/em-format.c:1062
 #: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2663
 #: ../mail/em-format-html.c:2728 ../mail/em-format-html.c:2752
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "Para"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.ui.h:5
-msgid "Sta_rt date:"
-msgstr "Fecha de ini_cio:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Resu_men:"
+#: ../calendar/gui/dialogs/task-page.c:342
+#: ../calendar/gui/dialogs/task-page.ui.h:9
+msgid "_List:"
+msgstr "_Lista:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Para:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+msgid "Sta_rt date:"
+msgstr "Fecha de ini_cio:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:342
-#: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_List:"
-msgstr "_Lista:"
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+msgid "Su_mmary:"
+msgstr "Resu_men:"
 
 #: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
@@ -3436,37 +3435,37 @@ msgid "21st to 31st"
 msgstr "del 21 al 31"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1189
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "lunes"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1190
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "martes"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1191
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "miÃrcoles"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1192
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "jueves"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1193
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "viernes"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1194
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "sÃbado"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1195
-#: ../modules/calendar/e-calendar-preferences.ui.h:38
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "domingo"
 
@@ -3501,27 +3500,29 @@ msgstr "No es posible obtener una selecciÃn que eliminar."
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
-msgid "Every"
-msgstr "Cada"
-
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgid "Exceptions"
-msgstr "Excepciones"
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "dÃa(s)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:88
-msgid "Preview"
-msgstr "Vista previa"
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+msgctxt "recurrpage"
+msgid "week(s)"
+msgstr "semana(s)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
-msgid "This appointment rec_urs"
-msgstr "Esta cita se _repite"
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+msgctxt "recurrpage"
+msgid "month(s)"
+msgstr "mes(es)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgctxt "recurrpage"
-msgid "day(s)"
-msgstr "dÃa(s)"
+msgid "year(s)"
+msgstr "aÃo(s)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
@@ -3532,32 +3533,30 @@ msgstr "durante"
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgctxt "recurrpage"
-msgid "forever"
-msgstr "para siempre"
+msgid "until"
+msgstr "hasta"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgctxt "recurrpage"
-msgid "month(s)"
-msgstr "mes(es)"
+msgid "forever"
+msgstr "para siempre"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgctxt "recurrpage"
-msgid "until"
-msgstr "hasta"
+msgid "This appointment rec_urs"
+msgstr "Esta cita se _repite"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
+msgid "Every"
+msgstr "Cada"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "semana(s)"
+msgid "Exceptions"
+msgstr "Excepciones"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "aÃo(s)"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../mail/mail-config.ui.h:27
+msgid "Preview"
+msgstr "Vista previa"
 
 #: ../calendar/gui/dialogs/send-comp.c:196
 msgid "Send my reminders with this event"
@@ -3576,112 +3575,113 @@ msgstr "La fecha de terminaciÃn es errÃnea"
 msgid "Web Page"
 msgstr "PÃgina web"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:300
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:778 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:646
-#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
-msgid "Canceled"
-msgstr "Cancelado"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:776
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
-#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:645 ../calendar/gui/print.c:3414
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
-msgid "Completed"
-msgstr "Terminado"
-
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-task-table.c:566 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-task-table.c:566 ../calendar/gui/tasktypes.xml.h:19
+#: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
 msgstr "Alta"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:489
-#: ../calendar/gui/e-cal-model-tasks.c:774
-#: ../calendar/gui/e-cal-model-tasks.c:852 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:644
-#: ../calendar/gui/print.c:3411
-msgid "In Progress"
-msgstr "En proceso"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1611 ../calendar/gui/e-task-table.c:567
+#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Normal"
+msgstr "Normal"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-task-table.c:568 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-task-table.c:568 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
 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:321
-#: ../calendar/gui/e-cal-model.c:1611 ../calendar/gui/e-task-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1284
-#: ../widgets/misc/e-send-options.ui.h:16
-msgid "Normal"
-msgstr "Normal"
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-task-table.c:569 ../calendar/gui/tasktypes.xml.h:22
+#: ../widgets/misc/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "Sin definir"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:304
 #: ../calendar/gui/e-cal-model-tasks.c:487
 #: ../calendar/gui/e-cal-model-tasks.c:772 ../calendar/gui/e-task-table.c:214
 #: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:643
-#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Sin comenzar"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
-msgid "P_ercent complete:"
-msgstr "_Porcentaje completado:"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:12
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:489
+#: ../calendar/gui/e-cal-model-tasks.c:774
+#: ../calendar/gui/e-cal-model-tasks.c:852 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:644
+#: ../calendar/gui/print.c:3411
+msgid "In Progress"
+msgstr "En proceso"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
-msgid "Stat_us:"
-msgstr "_Estado:"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:491
+#: ../calendar/gui/e-cal-model-tasks.c:776
+#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:645 ../calendar/gui/print.c:3414
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:387
+msgid "Completed"
+msgstr "Terminado"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../calendar/gui/e-cal-model-tasks.c:493
+#: ../calendar/gui/e-cal-model-tasks.c:778 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:646
+#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
+#, c-format
+msgid "Canceled"
+msgstr "Cancelado"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:18
-#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-cal-model.c:3500
 #: ../calendar/gui/e-meeting-list-view.c:661
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "Estado"
 
-#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
+msgid "Stat_us:"
+msgstr "_Estado:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:19
+msgid "P_ercent complete:"
+msgstr "_Porcentaje completado:"
+
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:569 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "Undefined"
-msgstr "Sin definir"
+#: ../widgets/misc/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Prioridad:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "_Fecha de terminaciÃn:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_Priority:"
-msgstr "_Prioridad:"
-
 #: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "PÃgina _web:"
@@ -3736,7 +3736,7 @@ msgstr ""
 "soporta asignaciÃn de tareas"
 
 #: ../calendar/gui/dialogs/task-page.c:350
-#: ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
@@ -3749,15 +3749,15 @@ msgstr "La fecha de vencimiento es errÃnea"
 msgid "Unable to open tasks in '%s': %s"
 msgstr "No se pueden abrir las tareas en Â%sÂ: %s"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Categor_ies..."
-msgstr "_CategorÃasâ"
-
 #: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "Fecha de _vencimiento:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:5
+msgid "Categor_ies..."
+msgstr "_CategorÃasâ"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Time zone:"
 msgstr "Zona horaria:"
 
@@ -4041,7 +4041,7 @@ msgstr "Estado:"
 msgid "Priority:"
 msgstr "Prioridad:"
 
-#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:159
 msgid "Description:"
 msgstr "DescripciÃn:"
 
@@ -4049,58 +4049,58 @@ msgstr "DescripciÃn:"
 msgid "Web Page:"
 msgstr "PÃgina web:"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% Terminado"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
 msgstr "Pulse para aÃadir una tarea"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Complete"
-msgstr "Terminado"
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+msgid "Start date"
+msgstr "Fecha de inicio"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-meeting-list-view.c:627
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../mail/e-mail-account-tree-view.c:139
+#: ../widgets/misc/e-attachment-tree-view.c:584
+msgid "Type"
+msgstr "Tipo"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Completion date"
 msgstr "Fecha de terminaciÃn"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:388
-msgid "Created"
-msgstr "Creado"
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Complete"
+msgstr "Terminado"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Fecha de vencimiento"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:9
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-memo-table.etspec.h:4
-msgid "Last modified"
-msgstr "Modificado por Ãltima vez"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:20
+#, no-c-format
+msgid "% Complete"
+msgstr "% Terminado"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:18
 #: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "Prioridad"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-msgid "Start date"
-msgstr "Fecha de inicio"
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../plugins/save-calendar/csv-format.c:388
+msgid "Created"
+msgstr "Creado"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:627
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../mail/e-mail-account-tree-view.c:139
-#: ../widgets/misc/e-attachment-tree-view.c:584
-msgid "Type"
-msgstr "Tipo"
+msgid "Last modified"
+msgstr "Modificado por Ãltima vez"
 
 #: ../calendar/gui/e-calendar-view.c:423
 msgid "Cut selected events to the clipboard"
@@ -4158,15 +4158,15 @@ msgstr "Lugar: %s"
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
-msgid "End Date"
-msgstr "Fecha de terminaciÃn"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Fecha de terminaciÃn"
+
 #: ../calendar/gui/e-cal-model.c:801 ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:175
@@ -4329,7 +4329,7 @@ msgstr "Muestra la segunda zona horaria"
 #: ../calendar/gui/e-day-view-time-item.c:842
 #: ../modules/calendar/e-calendar-preferences.c:179
 #: ../modules/calendar/e-calendar-preferences.c:231
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ninguno"
@@ -4364,7 +4364,7 @@ msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Grupo"
 
@@ -4417,7 +4417,7 @@ msgstr "Participante                          "
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/e-meeting-list-view.c:650
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "Confirmar"
 
@@ -4505,30 +4505,30 @@ msgstr "Hora de _inicio:"
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "Pulse aquà para aÃadir un participante"
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Nombre comÃn"
+msgid "Member"
+msgstr "Miembro"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Delegated To"
+msgstr "Delegado a"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Delegated From"
 msgstr "Delegado por"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegado a"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+msgid "Common Name"
+msgstr "Nombre comÃn"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Language"
 msgstr "Idioma"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Miembro"
-
 #: ../calendar/gui/e-memo-table.c:420
 #: ../modules/calendar/e-cal-shell-content.c:474
 #: ../modules/calendar/e-memo-shell-view-actions.c:231
@@ -4573,7 +4573,7 @@ msgstr "Borra las notas seleccionadas"
 msgid "Select all visible memos"
 msgstr "Seleccionar todas las notas visibles"
 
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Click to add a memo"
 msgstr "Pulse aquà para aÃadir una nota"
 
@@ -4589,7 +4589,7 @@ msgstr "%d%%"
 #: ../calendar/gui/e-task-table.c:692 ../calendar/gui/print.c:2287
 #: ../calendar/importers/icalendar-importer.c:85
 #: ../calendar/importers/icalendar-importer.c:1044
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 #: ../modules/calendar/e-cal-shell-content.c:435
 #: ../modules/calendar/e-task-shell-view-actions.c:254
 #: ../modules/calendar/e-task-shell-view-actions.c:269
@@ -4980,24 +4980,24 @@ msgstr "CategorÃas: %s"
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: ../calendar/gui/tasktypes.xml.h:2
-#, no-c-format
-msgid "% Completed"
-msgstr "% terminado"
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "In progress"
+msgstr "En proceso"
 
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: ../calendar/gui/tasktypes.xml.h:15
-msgid "In progress"
-msgstr "En proceso"
+#: ../calendar/gui/tasktypes.xml.h:25
+#, no-c-format
+msgid "% Completed"
+msgstr "% terminado"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "es mayor que"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "es menor que"
 
@@ -6758,13 +6758,13 @@ msgid "Please enter your password."
 msgstr "Introduzca su contrasenÌa."
 
 #: ../capplet/settings/mail-account-view.c:280
-#: ../mail/em-account-editor.c:5362 ../plugins/caldav/caldav-source.c:67
+#: ../mail/em-account-editor.c:5363 ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:374
 #: ../capplet/settings/mail-account-view.c:419
-#: ../mail/em-account-editor.c:5233 ../mail/em-account-editor.c:5290
+#: ../mail/em-account-editor.c:5234 ../mail/em-account-editor.c:5291
 #: ../modules/online-accounts/e-online-accounts-google.c:295
 #: ../modules/online-accounts/e-online-accounts-google.c:369
 #: ../plugins/google-account-setup/google-contacts-source.c:55
@@ -6776,31 +6776,31 @@ msgstr "Google"
 msgid "Personal details:"
 msgstr "Detalles personales:"
 
-#: ../capplet/settings/mail-account-view.c:493 ../mail/mail-config.ui.h:75
+#: ../capplet/settings/mail-account-view.c:493 ../mail/mail-config.ui.h:179
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../capplet/settings/mail-account-view.c:502 ../mail/mail-config.ui.h:46
+#: ../capplet/settings/mail-account-view.c:502 ../mail/mail-config.ui.h:180
 msgid "Email address:"
 msgstr "DirecciÃn de correo-e:"
 
-#: ../capplet/settings/mail-account-view.c:512 ../mail/mail-config.ui.h:38
+#: ../capplet/settings/mail-account-view.c:512 ../mail/mail-config.ui.h:181
 msgid "Details:"
 msgstr "Detalles:"
 
-#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:93
+#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:182
 msgid "Receiving"
 msgstr "RecepciÃn de correo"
 
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:129
+#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:184
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: ../capplet/settings/mail-account-view.c:536 ../mail/mail-config.ui.h:128
+#: ../capplet/settings/mail-account-view.c:536 ../mail/mail-config.ui.h:185
 msgid "Server address:"
 msgstr "DirecciÃn del servidor:"
 
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:153
+#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:186
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
@@ -6813,7 +6813,7 @@ msgstr "Usar cifrado:"
 msgid "never"
 msgstr "nunca"
 
-#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:113
+#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:183
 msgid "Sending"
 msgstr "Opciones de envÃo"
 
@@ -6915,7 +6915,7 @@ msgid "Back - Receiving options"
 msgstr "AtrÃs - Opciones de recepciÃn"
 
 #: ../capplet/settings/mail-account-view.c:641
-#: ../mail/em-account-editor.c:4043
+#: ../mail/em-account-editor.c:4044
 msgid "Defaults"
 msgstr "Predeterminados"
 
@@ -6944,12 +6944,12 @@ msgid "Setup Google calendar with Evolution"
 msgstr "Configurar el calendario de Google con Evolution"
 
 #: ../capplet/settings/mail-account-view.c:772
-#: ../mail/em-account-editor.c:4861
+#: ../mail/em-account-editor.c:4862
 msgid "You may need to enable IMAP access."
 msgstr "Puede que deba activar el acceso IMAP."
 
 #: ../capplet/settings/mail-account-view.c:780
-#: ../mail/em-account-editor.c:4838
+#: ../mail/em-account-editor.c:4839
 msgid "Google account settings:"
 msgstr "ConfiguraciÃn de la cuenta de Google:"
 
@@ -6958,7 +6958,7 @@ msgid "Setup Yahoo calendar with Evolution"
 msgstr "Configurar el calendario de Yahoo con Evolution"
 
 #: ../capplet/settings/mail-account-view.c:810
-#: ../mail/em-account-editor.c:4908
+#: ../mail/em-account-editor.c:4909
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -6969,7 +6969,7 @@ msgstr ""
 "calendario si no es correcto."
 
 #: ../capplet/settings/mail-account-view.c:819
-#: ../mail/em-account-editor.c:4893
+#: ../mail/em-account-editor.c:4894
 msgid "Yahoo account settings:"
 msgstr "ConfiguraciÃn de la cuenta de Yahoo:"
 
@@ -7282,56 +7282,70 @@ msgid "Untitled Message"
 msgstr "Mensaje sin tÃtulo"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-"Hay algunos adjuntos descargÃndose. Enviar el correo harà que se envÃe son "
-"esos adjuntos pendientes"
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "No puede adjuntar el archivo Â{0}Â a este mensaje."
 
 #: ../composer/mail-composer.error.xml.h:2
-msgid "All accounts have been removed."
-msgstr "Todas las cuentas han sido eliminadas."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+"El archivo Â{0}Â no es un archivo regular y no puede enviarse en un mensaje."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid "An error occurred while saving to your Drafts folder."
-msgstr "Ocurrià un error al guardar en su carpeta de Borradores."
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "No se pudo obtener un mensaje al que adjuntar desde {0}."
 
 #: ../composer/mail-composer.error.xml.h:4
-msgid "An error occurred while saving to your Outbox folder."
-msgstr "OcurrioÌ un error al guardar en su carpeta de Bandeja de salida."
+msgid "Because &quot;{1}&quot;."
+msgstr "Porque Â{1}Â."
 
 #: ../composer/mail-composer.error.xml.h:5
-msgid "An error occurred while sending. How do you want to proceed?"
-msgstr "Ocurrià un error al enviar. ÂCÃmo quiere proceder?"
+msgid "Do you want to recover unfinished messages?"
+msgstr "ÂQuiere recuperar los mensajes no terminados?"
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"ÂSeguro que quiere descartar el mensaje titulado Â{0} que està redactando?"
+"Evolution terminà inesperadamente mientras estaba redactando un mensaje "
+"nuevo. La recuperaciÃn del mensaje le permitirà continuar donde lo dejÃ."
 
 #: ../composer/mail-composer.error.xml.h:7
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
-"Debido a Â{0}Â, quizà necesite seleccionar diferentes opciones de correo."
+msgid "_Do not Recover"
+msgstr "_No recuperar"
 
 #: ../composer/mail-composer.error.xml.h:8
-msgid "Because &quot;{1}&quot;."
-msgstr "Porque Â{1}Â."
+msgid "_Recover"
+msgstr "_Recuperar"
 
 #: ../composer/mail-composer.error.xml.h:9
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "No es posible autoguardar el archivo Â{0}Â."
+
+#: ../composer/mail-composer.error.xml.h:10
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "Error al autoguardar debido a Â{1}Â."
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "Descarga en progreso. ÂQuiere enviar el correo?"
+
+#: ../composer/mail-composer.error.xml.h:12
 msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 msgstr ""
-"Se guardarà el mensaje en su carpeta local de Bandeja de salida debido a que "
-"està sin conexiÃn. Puede enviar el mensaje cuando vuelva a tener conexiÃn, "
-"pulsando el botÃn Enviar/Recibir en la barra de herramientas de Evolution."
+"Hay algunos adjuntos descargÃndose. Enviar el correo harà que se envÃe son "
+"esos adjuntos pendientes"
 
-#: ../composer/mail-composer.error.xml.h:10
+#: ../composer/mail-composer.error.xml.h:14
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+"ÂSeguro que quiere descartar el mensaje titulado Â{0} que està redactando?"
+
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -7341,205 +7355,184 @@ msgstr ""
 "permanentemente, a no ser que elija guardar el mensaje en la carpeta "
 "ÂBorradoresÂ. Esto le permitirà continuar el mensaje mÃs tarde."
 
-#: ../composer/mail-composer.error.xml.h:11
-msgid "Could not create message."
-msgstr "No es posible crear un mensaje."
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "No es posible leer el archivo de firma Â{0}Â."
-
-#: ../composer/mail-composer.error.xml.h:13
-msgid "Could not retrieve messages to attach from {0}."
-msgstr "No se pudo obtener un mensaje al que adjuntar desde {0}."
-
-#: ../composer/mail-composer.error.xml.h:14
-msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "No es posible autoguardar el archivo Â{0}Â."
-
-#: ../composer/mail-composer.error.xml.h:15
-msgid "Do you want to recover unfinished messages?"
-msgstr "ÂQuiere recuperar los mensajes no terminados?"
-
-#: ../composer/mail-composer.error.xml.h:16
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "Descarga en progreso. ÂQuiere enviar el correo?"
-
-#: ../composer/mail-composer.error.xml.h:17
-msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "Error al autoguardar debido a Â{1}Â."
-
+#. Response codes were chosen somewhat arbitrarily.
 #: ../composer/mail-composer.error.xml.h:18
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Evolution terminà inesperadamente mientras estaba redactando un mensaje "
-"nuevo. La recuperaciÃn del mensaje le permitirà continuar donde lo dejÃ."
+msgid "_Continue Editing"
+msgstr "_Continuar editando"
 
 #: ../composer/mail-composer.error.xml.h:19
-msgid "Saving message to Outbox."
-msgstr "Guardando mensaje en la Bandeja de salida."
+msgid "_Save Draft"
+msgstr "Guardar _borrador"
 
 #: ../composer/mail-composer.error.xml.h:20
-msgid "The file '{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"El archivo Â{0}Â no es un archivo regular y no puede enviarse en un mensaje."
+msgid "Could not create message."
+msgstr "No es posible crear un mensaje."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
-msgid "The reported error was &quot;{0}&quot;."
-msgstr "El error devuelto fue Â{0}Â."
+#: ../composer/mail-composer.error.xml.h:21
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr ""
+"Debido a Â{0}Â, quizà necesite seleccionar diferentes opciones de correo."
 
 #: ../composer/mail-composer.error.xml.h:22
-msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
-msgstr "El error devuelto fue Â{0}Â. Seguramente no se ha guardado el mensaje."
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "No es posible leer el archivo de firma Â{0}Â."
 
 #: ../composer/mail-composer.error.xml.h:23
-msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
-msgstr "El error devuelto fue Â{0}Â. No se ha enviado el mensaje."
+msgid "All accounts have been removed."
+msgstr "Todas las cuentas han sido eliminadas."
 
 #: ../composer/mail-composer.error.xml.h:24
-msgid "You cannot attach the file &quot;{0}&quot; to this message."
-msgstr "No puede adjuntar el archivo Â{0}Â a este mensaje."
-
-#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "Necesita configurar una cuenta antes de poder escribir correo."
 
+#: ../composer/mail-composer.error.xml.h:25
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "OcurrioÌ un error al guardar en su carpeta de Bandeja de salida."
+
 #: ../composer/mail-composer.error.xml.h:26
-msgid "Your message was sent, but an error occurred during post-processing."
-msgstr "Se envià su mensaje pero ocurrià un error en el posprocesado."
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr "El error devuelto fue Â{0}Â. No se ha enviado el mensaje."
 
-#. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:28
-msgid "_Continue Editing"
-msgstr "_Continuar editando"
+#: ../composer/mail-composer.error.xml.h:27
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "Ocurrià un error al guardar en su carpeta de Borradores."
 
-#: ../composer/mail-composer.error.xml.h:30
-msgid "_Do not Recover"
-msgstr "_No recuperar"
+#: ../composer/mail-composer.error.xml.h:28
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr "El error devuelto fue Â{0}Â. Seguramente no se ha guardado el mensaje."
 
-#: ../composer/mail-composer.error.xml.h:31
-msgid "_Recover"
-msgstr "_Recuperar"
+#: ../composer/mail-composer.error.xml.h:29
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "Ocurrià un error al enviar. ÂCÃmo quiere proceder?"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Draft"
-msgstr "Guardar _borrador"
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:157
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "El error devuelto fue Â{0}Â."
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save to Outbox"
 msgstr "_Guardar en la bandeja de salida"
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Try Again"
 msgstr "I_ntentarlo de nuevo"
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Calendar event notifications"
-msgstr "Notificaciones de acontecimientos del calendario"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "Se envià su mensaje pero ocurrià un error en el posprocesado."
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Evolution Alarm Notify"
-msgstr "Notificador de alertas de Evolution"
+#: ../composer/mail-composer.error.xml.h:34
+msgid "Saving message to Outbox."
+msgstr "Guardando mensaje en la Bandeja de salida."
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:938
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../composer/mail-composer.error.xml.h:35
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+"Se guardarà el mensaje en su carpeta local de Bandeja de salida debido a que "
+"està sin conexiÃn. Puede enviar el mensaje cuando vuelva a tener conexiÃn, "
+"pulsando el botÃn Enviar/Recibir en la barra de herramientas de Evolution."
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Notificador de alertas de Evolution"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "Notificaciones de acontecimientos del calendario"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:938
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "Evolution Mail and Calendar"
-msgstr "Correo y calendario de Evolution"
-
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Suite de trabajo en grupo"
 
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Correo y calendario de Evolution"
+
 #: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Gestione su correo-e, contactos y calendario"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Configure email accounts"
-msgstr "Configurar cuentas de correo-e"
-
-#: ../data/evolution-settings.desktop.in.in.h:2
 msgid "Email Settings"
 msgstr "Ajustes del correo"
 
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Configure email accounts"
+msgstr "Configurar cuentas de correo-e"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "Longitud del autocompletado"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
+msgid "Enable address formatting"
+msgstr "Activar formateado de direcciones"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "Contact layout style"
-msgstr "Estilo de distribuciÃn de los contactos"
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country"
+msgstr ""
+"Indica si se deben formatear las direcciones segÃn el estÃndar del paÃs de "
+"destino"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
-msgid "Contact preview pane position (horizontal)"
-msgstr "PosiciÃn del panel de vista previa de contactos (horizontal)"
+msgid "Autocomplete length"
+msgstr "Longitud del autocompletado"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-msgid "Contact preview pane position (vertical)"
-msgstr "PosiciÃn del panel de vista previa de contactos (vertical)"
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"El nÃmero de caracteres que deben teclearse antes de que Evolution intente "
+"autocompletar."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
-msgid "Enable address formatting"
-msgstr "Activar formateado de direcciones"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Mostrar el nombre autocompletado con la direcciÃn"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
-msgid "Position of the contact preview pane when oriented horizontally."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
 msgstr ""
-"PosiciÃn del panel de vista previa de contactos cuando està orientado "
-"horizontalmente."
+"Indica si se debe forzar el mostrado de la direcciÃn de corre-e con el "
+"nombre autocompletado del contacto en la entrada."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-msgid "Position of the contact preview pane when oriented vertically."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
-"PosiciÃn del panel de vista previa de contactos cuando està orientado "
-"verticalmente."
+"URI para la carpeta usada por Ãltima vez en el diÃlogo de selecciÃn de "
+"nombres"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
-msgid "Primary address book"
-msgstr "Libreta de direcciones primaria"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
+"URI para la carpeta usada por Ãltima vez en el diÃlogo de selecciÃn de "
+"nombres."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid "Show autocompleted name with an address"
-msgstr "Mostrar el nombre autocompletado con la direcciÃn"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Contact layout style"
+msgstr "Estilo de distribuciÃn de los contactos"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "Show maps"
-msgstr "Mostrar mapas"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
-msgid "Show preview pane"
-msgstr "Mostrar el panel de vista previa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view"
-msgstr ""
-"El UID de la libreta de direcciones seleccionada (o ÂprimariaÂ) en la barra "
-"lateral de la vista de ÂContactosÂ."
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -7551,52 +7544,59 @@ msgstr ""
 "vista previa debajo de la lista de contactos. Â1Â (vista vertical) ubica el "
 "panel de vista previa junto a la lista de contactos."
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "Contact preview pane position (horizontal)"
+msgstr "PosiciÃn del panel de vista previa de contactos (horizontal)"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+"PosiciÃn del panel de vista previa de contactos cuando està orientado "
+"horizontalmente."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid "Contact preview pane position (vertical)"
+msgstr "PosiciÃn del panel de vista previa de contactos (vertical)"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
+msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
-"El nÃmero de caracteres que deben teclearse antes de que Evolution intente "
-"autocompletar."
+"PosiciÃn del panel de vista previa de contactos cuando està orientado "
+"verticalmente."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid "URI for the folder last used in the select names dialog"
-msgstr ""
-"URI para la carpeta usada por Ãltima vez en el diÃlogo de selecciÃn de "
-"nombres"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Show maps"
+msgstr "Mostrar mapas"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
-msgid "URI for the folder last used in the select names dialog."
-msgstr ""
-"URI para la carpeta usada por Ãltima vez en el diÃlogo de selecciÃn de "
-"nombres."
+msgid "Whether to show maps in preview pane"
+msgstr "Indica si se muestran los mapas en el panel de vista previa"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country"
-msgstr ""
-"Indica si se deben formatear las direcciones segÃn el estÃndar del paÃs de "
-"destino"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "Primary address book"
+msgstr "Libreta de direcciones primaria"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view"
 msgstr ""
-"Indica si se debe forzar el mostrado de la direcciÃn de corre-e con el "
-"nombre autocompletado del contacto en la entrada."
+"El UID de la libreta de direcciones seleccionada (o ÂprimariaÂ) en la barra "
+"lateral de la vista de ÂContactosÂ."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-msgid "Whether to show maps in preview pane"
-msgstr "Indica si se muestran los mapas en el panel de vista previa"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+msgid "Show preview pane"
+msgstr "Mostrar el panel de vista previa"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "Indica si se muestra el panel de vista previa."
 
@@ -7615,264 +7615,290 @@ msgstr ""
 "correo normal provenientes de diferentes juegos de caracteres."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid "Ask for confirmation when deleting items"
-msgstr "Pedir confirmaciÃn al eliminar elementos"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Save directory for reminder audio"
+msgstr "Carpeta donde guardar los sonidos de los recordatorios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-msgid ""
-"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-"together with task-due-today-highlight"
-msgstr ""
-"Color de fondo para las tareas que vencen hoy, en formato Â#rrggbbÂ. Usado "
-"junto al resaltado de tareas que vencen hoy."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Directory for saving reminder audio files"
+msgstr "Carpeta para guardar los archivos de sonidos de recordatorios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-msgid ""
-"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-"together with task-overdue-highlight."
-msgstr ""
-"Color de fondo para las tareas que estÃn fuera de plazo, en formato "
-"Â#rrggbbÂ. Usado junto al resaltado de tareas fuera de plazo."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Birthday and anniversary reminder value"
+msgstr "Valor del recordatorio de cumpleaÃos y aniversarios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
-msgid "Birthday and anniversary reminder"
-msgstr "Recordatorio de cumpleaÃos y aniversarios"
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr ""
+"NÃmero de unidades para determinar un el recordatorio de un cumpleaÃos o "
+"aniversario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
 msgid "Birthday and anniversary reminder units"
 msgstr "Unidades del recordatorio de cumpleaÃos y aniversarios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-msgid "Birthday and anniversary reminder value"
-msgstr "Valor del recordatorio de cumpleaÃos y aniversarios"
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+"Unidades para el recordatorio de cumpleaÃos o aniversarios, ÂminutesÂ, Âhours "
+"o ÂdaysÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
-msgstr ""
-"Color para dibujar la lÃnea de Marcus Bains en la barra de Tiempo (vacÃa por "
-"omisiÃn)"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Compress weekends in month view"
+msgstr "Comprimir fines de semana en la vista mensual"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
-msgid "Color to draw the Marcus Bains line in the Day View"
-msgstr "Color para dibujar la lÃnea de Marcus Bains en la vista diaria"
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
+msgstr ""
+"Indica si se deben comprimir los fines de semana, lo cual pone al sÃbado y "
+"al domingo en el mismo espacio que un dÃa laborable"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Compress weekends in month view"
-msgstr "Comprimir fines de semana en la vista mensual"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "Ask for confirmation when deleting items"
+msgstr "Pedir confirmaciÃn al eliminar elementos"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Whether to ask for confirmation when deleting an appointment or task"
+msgstr "Indica si debe pedir confirmaciÃn al eliminar una cita o tarea"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
 msgid "Confirm expunge"
 msgstr "Confirmar compactaciÃn"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-msgid "Days on which the start and end of work hours should be indicated"
-msgstr ""
-"DÃas en los cuales debe indicarse el inicio y fin de las horas de trabajo"
-
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-msgid "Default appointment reminder"
-msgstr "Recordatorio predeterminado de citas"
+msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgstr "Indica si debe pedir confirmaciÃn al purgar citas y tareas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "Unidades predeterminadas del recordatorio"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Month view vertical pane position"
+msgstr "PosiciÃn del panel vertical en la vista mensual"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "Valor predeterminado del recordatorio"
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
+msgstr ""
+"PosiciÃn del panel vertical, entre las listas del calendario el calendario "
+"del navegador de fechas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
-msgid "Directory for saving reminder audio files"
-msgstr "Carpeta para guardar los archivos de sonidos de recordatorios"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "Workday end hour"
+msgstr "Hora de finalizaciÃn de la jornada laboral"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
-msgid "Free/busy template URL"
-msgstr "URL de la plantilla de disponibilidad"
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgstr ""
+"Hora en la que acaba la jornada laboral, en formato de veinticuatro horas, "
+"de 0 a 23"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
-msgid "Hide completed tasks"
-msgstr "Ocultar tareas terminadas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Workday end minute"
+msgstr "Minuto de finalizaciÃn de la jornada laboral"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
-msgid "Hide task units"
-msgstr "Ocultar Lista de tareas nueva"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minuto en el que acaba la jornada laboral, de 0 a 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
-msgid "Hide task value"
-msgstr "Ocultar el valor de la tarea"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Workday start hour"
+msgstr "Hora de comienzo de la jornada laboral"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-msgid "Highlight overdue tasks"
-msgstr "Resaltar tareas fuera de plazo"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
+"Hora a la que empieza la jornada laboral, en formato de veinticuatro horas, "
+"de 0 a 23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-msgid "Highlight tasks due today"
-msgstr "Resaltar tareas que vencen hoy"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "Workday start minute"
+msgstr "Minuto de comienzo de la jornada laboral"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
-msgid "Horizontal pane position"
-msgstr "PosiciÃn horizontal del panel"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minuto en el que empieza la jornada laboral, de 0 a 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
-msgstr ""
-"Hora en la que acaba la jornada laboral, en formato de veinticuatro horas, "
-"de 0 a 23"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+msgid "The second timezone for a Day View"
+msgstr "La segunda zona horaria para una Vista diaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key"
 msgstr ""
-"Hora a la que empieza la jornada laboral, en formato de veinticuatro horas, "
-"de 0 a 23."
+"Muestra la segunda zona horaria en la Vista diaria, si està establecido. El "
+"valor es similar al usado en la clave ÂtimezoneÂ."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-msgid "If \"true\", show the memo preview pane in the main window"
-msgstr ""
-"Si es cierto mostrarà el panel de vista previa de notas en la ventana "
-"principal"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Recently used second time zones in a Day View"
+msgstr "Zonas horarias secundarias recientemente usadas en una Vista diaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-msgid "If \"true\", show the task preview pane in the main window"
+msgid "List of recently used second time zones in a Day View"
 msgstr ""
-"Si es cierto mostrarà el panel de vista previa de tareas en la ventana "
-"principal"
+"Lista de zonas horarias secundarias recientemente usadas en una Vista diaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-msgid "Intervals shown in Day and Work Week views, in minutes"
-msgstr ""
-"Los intervalos de tiempo mostrados en las vistas diarias y semanales, en "
-"minutos"
+msgid "Maximum number of recently used timezones to remember"
+msgstr "NÃmero mÃximo de zonas horarias usadas recientemente para recordar"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
-msgid "Last reminder time"
-msgstr "Hora del Ãltimo recordatorio"
+msgid ""
+"Maximum number of recently used timezones to remember in a 'day-second-"
+"zones' list"
+msgstr ""
+"NÃmero mÃximo de zonas horarias usadas recientemente para recordar en la "
+"lista Âday_second_zonesÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-msgid "List of calendars to load"
-msgstr "Lista de calendarios disponibles"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid "Default reminder value"
+msgstr "Valor predeterminado del recordatorio"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-msgid "List of memo lists to load"
-msgstr "El registro de lista de nota"
+msgid "Number of units for determining a default reminder"
+msgstr "NÃmero de unidades para determinar un recordatorio predeterminado"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-msgid "List of recently used second time zones in a Day View"
-msgstr ""
-"Lista de zonas horarias secundarias recientemente usadas en una Vista diaria"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid "Default reminder units"
+msgstr "Unidades predeterminadas del recordatorio"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-msgid "List of selected calendars"
-msgstr "Lista de los calendarios seleccionados"
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
+msgstr "Unidades para el recordatorio predeterminado, ÂminutesÂ, Âhours o ÂdaysÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-msgid "List of selected memo lists"
-msgstr "Lista de listas notas seleccionadas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+"Mostrar el campo de categorÃas en el editor de acontecimientos/reuniones/"
+"tareas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-msgid "List of selected task lists"
-msgstr "Lista de listas de tareas seleccionadas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+"Indica si debe mostrar el campo ÂCategorÃas en el editor de acontecimientos/"
+"reuniones"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-msgid "List of task lists to load"
-msgstr "Lista de listas de tareas para cargar"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Mostrar el campo ÂRol en el editor de acontecimientos/tareas/reuniones"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
-msgid "Marcus Bains Line"
-msgstr "LÃnea de Marcus Bains"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+"Indica si debe mostrar el campo ÂRol en el editor de acontecimientos/tareas/"
+"reuniones"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Marcus Bains Line Color - Day View"
-msgstr "Color de la lÃnea de Marcus Bains de la vista de dÃa"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+"Mostrar el campo ÂConfirmar en el editor de acontecimientos/tareas/reuniones"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Color de la lÃnea de Marcus Bains de la barra de tiempo"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+"Indica si debe mostrar el campo ÂConfirmar en el editor de acontecimiento/"
+"tareas/reuniones"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-msgid "Maximum number of recently used timezones to remember"
-msgstr "NÃmero mÃximo de zonas horarias usadas recientemente para recordar"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+"Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-msgid ""
-"Maximum number of recently used timezones to remember in a 'day-second-"
-"zones' list"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
-"NÃmero mÃximo de zonas horarias usadas recientemente para recordar en la "
-"lista Âday_second_zonesÂ"
+"Indica si debe mostrar el campo ÂEstado en el editor de acontecimientos/"
+"tareas/reuniones"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-msgid "Memo layout style"
-msgstr "Estilo de la distribuciÃn de notas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+"Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
-msgid "Memo preview pane position (horizontal)"
-msgstr "Vista previa del panel de posiciÃn de las notas (horizontal)"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+"Indica si debe mostrar el campo ÂZona horaria en el editor de "
+"acontecimientos/reuniones"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid "Memo preview pane position (vertical)"
-msgstr "Vista previa del panel de posiciÃn de las notas (vertical)"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+"Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "Minuto en el que acaba la jornada laboral, de 0 a 59."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+"Indica si debe mostrar el campo ÂTipo en el editor de acontecimientos/tareas/"
+"reuniones"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "Minuto en el que empieza la jornada laboral, de 0 a 59."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Hide completed tasks"
+msgstr "Ocultar tareas terminadas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
-msgid "Month view horizontal pane position"
-msgstr "PosiciÃn del panel horizontal de la vista mensual"
+msgid "Whether to hide completed tasks in the tasks view"
+msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid "Month view vertical pane position"
-msgstr "PosiciÃn del panel vertical en la vista mensual"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid "Hide task units"
+msgstr "Ocultar Lista de tareas nueva"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
-msgid "Number of units for determining a birthday or anniversary reminder"
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 msgstr ""
-"NÃmero de unidades para determinar un el recordatorio de un cumpleaÃos o "
-"aniversario"
+"Unidades para determinar cuÃndo ocultar tareas, ÂminutesÂ, Âhours o ÂdaysÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-msgid "Number of units for determining a default reminder"
-msgstr "NÃmero de unidades para determinar un recordatorio predeterminado"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid "Hide task value"
+msgstr "Ocultar el valor de la tarea"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
 msgid "Number of units for determining when to hide tasks"
 msgstr "NÃmero de unidades para determinar cuÃndo ocultar tareas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
-msgid "Overdue tasks color"
-msgstr "Color para las tareas fuera de plazo"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Horizontal pane position"
+msgstr "PosiciÃn horizontal del panel"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid ""
@@ -7883,183 +7909,132 @@ msgstr ""
 "calendario y lista de tareas cuando no està en la vista mensual, en pÃxeles"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels"
-msgstr ""
-"PosiciÃn del panel horizontal, entre la vista y el navegador de fechas del "
-"calendario y la lista de tareas en la vista de mes, en pÃxeles"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Last reminder time"
+msgstr "Hora del Ãltimo recordatorio"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
-msgid "Position of the memo preview pane when oriented vertically"
-msgstr ""
-"PosiciÃn del panel de vista previa de notas cuando està orientado "
-"verticalmente"
+msgid "Time the last reminder ran, in time_t"
+msgstr "La hora en que el Ãltimo recordatorio sonÃ, en time_t"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-msgid "Position of the task preview pane when oriented horizontally"
-msgstr ""
-"PosiciÃn del panel de vista previa de tareas cuando està orientado "
-"horizontalmente"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Color de la lÃnea de Marcus Bains de la vista de dÃa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
-msgid "Position of the task preview pane when oriented vertically"
-msgstr ""
-"PosiciÃn del panel de vista previa de tareas cuando està orientado "
-"verticalmente"
+msgid "Color to draw the Marcus Bains line in the Day View"
+msgstr "Color para dibujar la lÃnea de Marcus Bains en la vista diaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar"
-msgstr ""
-"PosiciÃn del panel vertical, entre las listas del calendario el calendario "
-"del navegador de fechas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Color de la lÃnea de Marcus Bains de la barra de tiempo"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid "Primary calendar"
-msgstr "Calendario primario"
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
+msgstr ""
+"Color para dibujar la lÃnea de Marcus Bains en la barra de Tiempo (vacÃa por "
+"omisiÃn)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
-msgid "Primary memo list"
-msgstr "Lista de notas primaria"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Marcus Bains Line"
+msgstr "LÃnea de Marcus Bains"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary task list"
-msgstr "Lista de tareas primaria"
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgstr ""
+"Indica si debe dibujar la lÃnea Marcus Bains (lÃnea a la hora actual) en el "
+"calendario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-msgid "Programs that are allowed to be run by reminders"
-msgstr "Programas que se permite que ejecuten por los recordatorios"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Memo preview pane position (horizontal)"
+msgstr "Vista previa del panel de posiciÃn de las notas (horizontal)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Recently used second time zones in a Day View"
-msgstr "Zonas horarias secundarias recientemente usadas en una Vista diaria"
+msgid "Position of the task preview pane when oriented horizontally"
+msgstr ""
+"PosiciÃn del panel de vista previa de tareas cuando està orientado "
+"horizontalmente"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Recurrent Events in Italic"
-msgstr "Los acontecimientos que se repiten en cursiva"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Memo layout style"
+msgstr "Estilo de la distribuciÃn de notas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
-msgid "Reminder programs"
-msgstr "Notas de recordatorios"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list"
+msgstr ""
+"El estilo de la distribuciÃn determina dÃnde ubicar el panel de vista previa "
+"en relaciÃn con la lista de notas. Â0Â (vista clÃsica) ubica el panel de "
+"vista previa debajo de la lista de notas. Â1Â (vista vertical) ubica el panel "
+"de vista previa junto a la lista de notas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for reminder audio"
-msgstr "Carpeta donde guardar los sonidos de los recordatorios"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid "Memo preview pane position (vertical)"
+msgstr "Vista previa del panel de posiciÃn de las notas (vertical)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
-msgid "Scroll Month View by a week, not by a month"
+msgid "Position of the memo preview pane when oriented vertically"
 msgstr ""
-"Indica si se debe desplazar la vista mensual una semana, en lugar de un mes"
+"PosiciÃn del panel de vista previa de notas cuando està orientado "
+"verticalmente"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Mostrar el campo ÂConfirmar en el editor de acontecimientos/tareas/reuniones"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Month view horizontal pane position"
+msgstr "PosiciÃn del panel horizontal de la vista mensual"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "Mostrar el campo ÂRol en el editor de acontecimientos/tareas/reuniones"
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
+msgstr ""
+"PosiciÃn del panel horizontal, entre la vista y el navegador de fechas del "
+"calendario y la lista de tareas en la vista de mes, en pÃxeles"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
+msgid "Scroll Month View by a week, not by a month"
 msgstr ""
-"Mostrar las horas de finalizaciÃn de las citas en las vistas semanales y "
-"mensuales"
+"Indica si se debe desplazar la vista mensual una semana, en lugar de un mes"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
-"Mostrar el campo de categorÃas en el editor de acontecimientos/reuniones/"
-"tareas"
+msgid "Whether to scroll a Month View by a week, not by a month"
+msgstr "Indica si se debe desplazar la vista mensual una semana, no un mes"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-msgid "Show days with recurrent events in italic font in bottom left calendar"
-msgstr ""
-"Mostrar los dÃas con acontecimientos que se repiten con una tipografÃa "
-"cursiva en la parte inferior izquierda del calendario"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Reminder programs"
+msgstr "Notas de recordatorios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display reminders in notification tray"
-msgstr "Mostrar el visor del recordatorio en la bandeja de notificaciÃn"
+msgid "Programs that are allowed to be run by reminders"
+msgstr "Programas que se permite que ejecuten por los recordatorios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Show status field in the event/task/meeting editor"
-msgstr ""
-"Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Show display reminders in notification tray"
+msgstr "Mostrar el visor del recordatorio en la bandeja de notificaciÃn"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the memo preview pane"
-msgstr "Mostrar el panel de vista previa de las notas"
+msgid "Whether or not to use the notification tray for display reminders"
+msgstr ""
+"Indica si se debe usar o no la bandeja de notificaciÃn para mostrar "
+"recordatorios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid "Show the task preview pane"
-msgstr "Mostrar el panel de vista previa de las tareas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Primary calendar"
+msgstr "Calendario primario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
-msgid "Show timezone field in the event/meeting editor"
-msgstr ""
-"Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show type field in the event/task/meeting editor"
-msgstr ""
-"Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr ""
-"Mostrar los nÃmeros de las semanas en la Vistas diaria, Vista de la semana "
-"laboral y el Navegador del calendario"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key"
-msgstr ""
-"Muestra la segunda zona horaria en la Vista diaria, si està establecido. El "
-"valor es similar al usado en la clave ÂtimezoneÂ."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
-msgid "Task layout style"
-msgstr "Estilo de distribuciÃn de las tareas"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (horizontal)"
-msgstr "Vista previa del panel de posiciÃn de las tareas (horizontal)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
-msgid "Task preview pane position (vertical)"
-msgstr "Vista previa del panel de posiciÃn de las tareas (vertical)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Tasks due today color"
-msgstr "Color para las tareas que vencen hoy"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
@@ -8067,7 +8042,12 @@ msgstr ""
 "El UID del calendario seleccionado (o ÂprimarioÂ) en la barra lateral de la "
 "vista de ÂCalendarioÂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Primary memo list"
+msgstr "Lista de notas primaria"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
@@ -8075,7 +8055,12 @@ msgstr ""
 "El UID de la nota seleccionada (o ÂprimariaÂ) en la barra lateral de la vista "
 "de ÂNotasÂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Primary task list"
+msgstr "Lista de tareas primaria"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
@@ -8083,7 +8068,12 @@ msgstr ""
 "El UID de la tarea seleccionada (o ÂprimariaÂ) en la barra lateral de la "
 "vista de ÂTareasÂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Free/busy template URL"
+msgstr "URL de la plantilla de disponibilidad"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -8093,266 +8083,267 @@ msgstr ""
 "reemplaza por la parte del usuario de la direcciÃn de correo y %d se "
 "reemplaza por el dominio"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olson timezone database location like \"America/New York\""
-msgstr ""
-"La zona horaria predeterminada que se usarà en las fechas y horas en el "
-"calendario, como una localizaciÃn sin correspondencia en una base de datos "
-"de zonas horarias Olsen, como en ÂAmÃrica/Nueva YorkÂ"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Recurrent Events in Italic"
+msgstr "Los acontecimientos que se repiten en cursiva"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
-"El estilo de la distribuciÃn determina dÃnde ubicar el panel de vista previa "
-"en relaciÃn con la lista de notas. Â0Â (vista clÃsica) ubica el panel de "
-"vista previa debajo de la lista de notas. Â1Â (vista vertical) ubica el panel "
-"de vista previa junto a la lista de notas"
+"Mostrar los dÃas con acontecimientos que se repiten con una tipografÃa "
+"cursiva en la parte inferior izquierda del calendario"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list"
-msgstr ""
-"El estilo de la distribuciÃn determina dÃnde ubicar el panel de vista previa "
-"en relaciÃn con la lista de tareas. Â0Â (vista clÃsica) ubica el panel de "
-"vista previa debajo de la lista de tareas. Â1Â (vista vertical) ubica el "
-"panel de vista previa junto a la lista de tareas"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+msgid "List of selected calendars"
+msgstr "Lista de los calendarios seleccionados"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+msgid "List of calendars to load"
+msgstr "Lista de calendarios disponibles"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+msgid "List of selected memo lists"
+msgstr "Lista de listas notas seleccionadas"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+msgid "List of memo lists to load"
+msgstr "El registro de lista de nota"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+msgid "List of selected task lists"
+msgstr "Lista de listas de tareas seleccionadas"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+msgid "List of task lists to load"
+msgstr "Lista de listas de tareas para cargar"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
-msgid "The second timezone for a Day View"
-msgstr "La segunda zona horaria para una Vista diaria"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Show appointment end times in week and month views"
+msgstr ""
+"Mostrar las horas de finalizaciÃn de las citas en las vistas semanales y "
+"mensuales"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
-msgid "Time divisions"
-msgstr "Divisiones de hora"
+msgid "Whether to display the end time of events in the week and month views"
+msgstr ""
+"Indica si debe mostrar la hora de finalizaciÃn de los acontecimientos en las "
+"vistas semanales y mensuales"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "Time the last reminder ran, in time_t"
-msgstr "La hora en que el Ãltimo recordatorio sonÃ, en time_t"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid "Show the memo preview pane"
+msgstr "Mostrar el panel de vista previa de las notas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
-msgid "Timezone"
-msgstr "Zona horaria"
+msgid "If \"true\", show the memo preview pane in the main window"
+msgstr ""
+"Si es cierto mostrarà el panel de vista previa de notas en la ventana "
+"principal"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Twenty four hour time format"
-msgstr "Formato de hora de veinticuatro horas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Show the task preview pane"
+msgstr "Mostrar el panel de vista previa de las tareas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
+msgid "If \"true\", show the task preview pane in the main window"
 msgstr ""
-"Unidades para el recordatorio de cumpleaÃos o aniversarios, ÂminutesÂ, Âhours "
-"o ÂdaysÂ"
+"Si es cierto mostrarà el panel de vista previa de tareas en la ventana "
+"principal"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
-msgstr "Unidades para el recordatorio predeterminado, ÂminutesÂ, Âhours o ÂdaysÂ"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr ""
+"Mostrar los nÃmeros de las semanas en la Vistas diaria, Vista de la semana "
+"laboral y el Navegador del calendario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
+msgid "Whether to show week numbers in various places in the Calendar"
 msgstr ""
-"Unidades para determinar cuÃndo ocultar tareas, ÂminutesÂ, Âhours o ÂdaysÂ"
+"Indica si debe mostrar los nÃmeros de la semana en varias partes del "
+"calendario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Use system timezone"
-msgstr "Usar la hora del sistema"
+msgid "Vertical position for the tag pane"
+msgstr "PosiciÃn vertical del panel de etiquetas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-msgid "Use the system timezone instead of the timezone selected in Evolution"
-msgstr ""
-"Usar la zona horaria del sistema en lugar de la zona horaria seleccionada en "
-"Evolution"
+msgid "Highlight tasks due today"
+msgstr "Resaltar tareas que vencen hoy"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
-msgid "Vertical position for the tag pane"
-msgstr "PosiciÃn vertical del panel de etiquetas"
+msgid ""
+"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr ""
+"Indica si las tareas que vencen hoy se resaltan con un color especial (color "
+"para tareas que vencen hoy)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
-msgid "Week start"
-msgstr "Comienzo de la semana"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+msgid "Tasks due today color"
+msgstr "Color para las tareas que vencen hoy"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
+msgid ""
+"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
+"together with task-due-today-highlight"
 msgstr ""
-"El dÃa en que empieza la semana, desde el domingo (0) hasta el sÃbado (6)"
+"Color de fondo para las tareas que vencen hoy, en formato Â#rrggbbÂ. Usado "
+"junto al resaltado de tareas que vencen hoy."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
-msgid ""
-"Whether highlight overdue tasks with a special color (task-overdue-color)"
-msgstr ""
-"Indica si las tareas fuera de plazo se resaltan con un color especial (color "
-"para tareas fuera de plazo)"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Task preview pane position (horizontal)"
+msgstr "Vista previa del panel de posiciÃn de las tareas (horizontal)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
-msgid ""
-"Whether highlight tasks due today with a special color (task-due-today-color)"
-msgstr ""
-"Indica si las tareas que vencen hoy se resaltan con un color especial (color "
-"para tareas que vencen hoy)"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid "Task layout style"
+msgstr "Estilo de distribuciÃn de las tareas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-msgid "Whether or not to use the notification tray for display reminders"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list"
 msgstr ""
-"Indica si se debe usar o no la bandeja de notificaciÃn para mostrar "
-"recordatorios"
+"El estilo de la distribuciÃn determina dÃnde ubicar el panel de vista previa "
+"en relaciÃn con la lista de tareas. Â0Â (vista clÃsica) ubica el panel de "
+"vista previa debajo de la lista de tareas. Â1Â (vista vertical) ubica el "
+"panel de vista previa junto a la lista de tareas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-msgid "Whether to ask for confirmation when deleting an appointment or task"
-msgstr "Indica si debe pedir confirmaciÃn al eliminar una cita o tarea"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Task preview pane position (vertical)"
+msgstr "Vista previa del panel de posiciÃn de las tareas (vertical)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
-msgid "Whether to ask for confirmation when expunging appointments and tasks"
-msgstr "Indica si debe pedir confirmaciÃn al purgar citas y tareas"
+msgid "Position of the task preview pane when oriented vertically"
+msgstr ""
+"PosiciÃn del panel de vista previa de tareas cuando està orientado "
+"verticalmente"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday"
-msgstr ""
-"Indica si se deben comprimir los fines de semana, lo cual pone al sÃbado y "
-"al domingo en el mismo espacio que un dÃa laborable"
+msgid "Highlight overdue tasks"
+msgstr "Resaltar tareas fuera de plazo"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-msgid "Whether to display the end time of events in the week and month views"
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
-"Indica si debe mostrar la hora de finalizaciÃn de los acontecimientos en las "
-"vistas semanales y mensuales"
+"Indica si las tareas fuera de plazo se resaltan con un color especial (color "
+"para tareas fuera de plazo)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
-msgstr ""
-"Indica si debe dibujar la lÃnea Marcus Bains (lÃnea a la hora actual) en el "
-"calendario"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid "Overdue tasks color"
+msgstr "Color para las tareas fuera de plazo"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
-msgid "Whether to hide completed tasks in the tasks view"
-msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas"
+msgid ""
+"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
+"together with task-overdue-highlight."
+msgstr ""
+"Color de fondo para las tareas que estÃn fuera de plazo, en formato "
+"Â#rrggbbÂ. Usado junto al resaltado de tareas fuera de plazo."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-msgid "Whether to scroll a Month View by a week, not by a month"
-msgstr "Indica si se debe desplazar la vista mensual una semana, no un mes"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid "Time divisions"
+msgstr "Divisiones de hora"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
-msgid "Whether to set a default reminder for appointments"
+msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr ""
-"Indica si debe establecer un recordatorio predeterminado para las citas"
+"Los intervalos de tiempo mostrados en las vistas diarias y semanales, en "
+"minutos"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-msgid "Whether to set a reminder for birthdays and anniversaries"
-msgstr ""
-"Indica si debe establecer un recordatorio para cumpleaÃos y aniversarios"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Timezone"
+msgstr "Zona horaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olson timezone database location like \"America/New York\""
 msgstr ""
-"Indica si debe mostrar el campo ÂConfirmar en el editor de acontecimiento/"
-"tareas/reuniones"
+"La zona horaria predeterminada que se usarà en las fechas y horas en el "
+"calendario, como una localizaciÃn sin correspondencia en una base de datos "
+"de zonas horarias Olsen, como en ÂAmÃrica/Nueva YorkÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr ""
-"Indica si debe mostrar el campo ÂCategorÃas en el editor de acontecimientos/"
-"reuniones"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Twenty four hour time format"
+msgstr "Formato de hora de veinticuatro horas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether to show role field in the event/task/meeting editor"
+msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr ""
-"Indica si debe mostrar el campo ÂRol en el editor de acontecimientos/tareas/"
-"reuniones"
+"Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
+"usar am/pm"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-"Indica si debe mostrar el campo ÂEstado en el editor de acontecimientos/"
-"tareas/reuniones"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Birthday and anniversary reminder"
+msgstr "Recordatorio de cumpleaÃos y aniversarios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
-msgid "Whether to show times in twenty four hour format instead of using am/pm"
+msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr ""
-"Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
-"usar am/pm"
+"Indica si debe establecer un recordatorio para cumpleaÃos y aniversarios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-"Indica si debe mostrar el campo ÂZona horaria en el editor de "
-"acontecimientos/reuniones"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Default appointment reminder"
+msgstr "Recordatorio predeterminado de citas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show type field in the event/task/meeting editor"
+msgid "Whether to set a default reminder for appointments"
 msgstr ""
-"Indica si debe mostrar el campo ÂTipo en el editor de acontecimientos/tareas/"
-"reuniones"
+"Indica si debe establecer un recordatorio predeterminado para las citas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "Whether to show week numbers in various places in the Calendar"
-msgstr ""
-"Indica si debe mostrar los nÃmeros de la semana en varias partes del "
-"calendario"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Use system timezone"
+msgstr "Usar la hora del sistema"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
-msgid "Work days"
-msgstr "DÃas laborables"
+msgid "Use the system timezone instead of the timezone selected in Evolution"
+msgstr ""
+"Usar la zona horaria del sistema en lugar de la zona horaria seleccionada en "
+"Evolution"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday end hour"
-msgstr "Hora de finalizaciÃn de la jornada laboral"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "Week start"
+msgstr "Comienzo de la semana"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday end minute"
-msgstr "Minuto de finalizaciÃn de la jornada laboral"
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
+msgstr ""
+"El dÃa en que empieza la semana, desde el domingo (0) hasta el sÃbado (6)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
-msgid "Workday start hour"
-msgstr "Hora de comienzo de la jornada laboral"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Work days"
+msgstr "DÃas laborables"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid "Workday start minute"
-msgstr "Minuto de comienzo de la jornada laboral"
+msgid "Days on which the start and end of work hours should be indicated"
+msgstr ""
+"DÃas en los cuales debe indicarse el inicio y fin de las horas de trabajo"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Configuration version"
 msgstr "VersiÃn de la configuraciÃn"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Last upgraded configuration version"
-msgstr "Ãltima versiÃn de la configuraciÃn actualizada"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:3
-msgid "List of disabled plugins"
-msgstr "Lista de complementos desactivados"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -8360,8 +8351,13 @@ msgstr ""
 "La versiÃn de configuraciÃn de Evolution, con nivel de configuraciÃn mayor/"
 "menor (por ejemplo \"2.6.0\")."
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Last upgraded configuration version"
+msgstr "Ãltima versiÃn de la configuraciÃn actualizada"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -8369,6 +8365,10 @@ msgstr ""
 "La Ãltima versiÃn de configuraciÃn de Evolution actualizada, con nivel de "
 "configuraciÃn mayor/menor (por ejemplo \"2.6.0\")."
 
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
+msgid "List of disabled plugins"
+msgstr "Lista de complementos desactivados"
+
 #: ../data/org.gnome.evolution.gschema.xml.in.h:6
 msgid "The list of disabled plugins in Evolution"
 msgstr "La lista de complementos desactivados de Evolution"
@@ -8382,13 +8382,13 @@ msgid "The window's Y coordinate"
 msgstr "La coordenada Y de la ventana"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:9
-msgid "The window's height in pixels"
-msgstr "La altura de la ventana en pÃxeles"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:10
 msgid "The window's width in pixels"
 msgstr "La anchura de la ventana en pÃxeles"
 
+#: ../data/org.gnome.evolution.gschema.xml.in.h:10
+msgid "The window's height in pixels"
+msgstr "La altura de la ventana en pÃxeles"
+
 #: ../data/org.gnome.evolution.gschema.xml.in.h:11
 msgid "Whether the window is maximized"
 msgstr "Indica si la ventana està maximizada"
@@ -8398,1345 +8398,1343 @@ msgid "Gnome Calendar's calendar import done"
 msgstr "ImportaciÃn del calendario de GNOME terminada"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-msgid "Gnome Calendar's tasks import done"
-msgstr "ImportaciÃn de las tareas del calendario de GNOME terminada"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
 msgid "Whether calendar from Gnome Calendar has been imported or not"
 msgstr "Indica si el calendario de GNOME se ha importado o no"
 
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
+msgid "Gnome Calendar's tasks import done"
+msgstr "ImportaciÃn de las tareas del calendario de GNOME terminada"
+
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
 msgid "Whether tasks from Gnome Calendar have been imported or not"
 msgstr "Indica si las tareas del calendario de GNOME se han importado o no"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-#: ../mail/evolution-mail.schemas.in.h:13
-msgid "Always request read receipt"
-msgstr "Siempre solicitar confirmaciÃn de lectura"
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Comprobar si Evolution es la aplicaciÃn de correo predeterminada"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Amount of time in seconds the error should be shown on the status bar."
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
-"Tiempo en segundos que deberà mostrarse el error en la barra de estado."
+"Cada vez que Evolution se inicie, comprobar si es o no el cliente de correo "
+"predeterminado."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-#: ../mail/evolution-mail.schemas.in.h:15
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
-msgstr ""
-"Preguntar si cerrar la ventana del mensaje cuando el usuario reenvÃa o "
-"responde al mensaje mostrado en la ventana"
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "Default charset in which to compose messages"
+msgstr "Conjunto de caracteres predeterminado para redactar mensajes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Attribute message"
-msgstr "Atribuir mensaje"
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "Default charset in which to compose messages."
+msgstr "Conjunto de caracteres predeterminado para redactar mensajes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Automatic emoticon recognition"
-msgstr "Reconocimiento automÃtico de emoticonos"
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid "Path where picture gallery should search for its content"
+msgstr "Ruta donde la galerÃa de imÃgenes deberÃa buscar su contenido"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-#: ../mail/evolution-mail.schemas.in.h:18
-msgid "Automatic link recognition"
-msgstr "Reconocimiento automÃtico de enlaces"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
-"Automatically enable PGP or S/MIME signatures when replying to a message "
-"which is also PGP or S/MIME signed."
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
 msgstr ""
-"Activar las firmas PGP o S/MIME automaÌticamente al responder a un mensaje "
-"firmado con PGP o S/MIME."
+"Este valor puede ser una cadena vacÃa, lo que significa que usarà la carpeta "
+"ImÃgenes del sistema, habitualmente ~/ImÃgenes. TambiÃn se usarà esta "
+"carpeta cuando la ruta configurada no apunte a la carpeta existente."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Spell check inline"
+msgstr "ComprobaciÃn ortogrÃfica en lÃnea"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#: ../mail/evolution-mail.schemas.in.h:20
-msgid "Check for new messages in all active accounts"
-msgstr "Comprobar si hay mensajes nuevos en todas las cuentas activas"
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+"Dibujar indicadores de errores tipogrÃficos en las palabras mientras se "
+"escribe."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-#: ../mail/evolution-mail.schemas.in.h:21
-msgid "Check for new messages on start"
-msgstr "Comprobar si hay mensajes nuevos al inicio"
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Automatic link recognition"
+msgstr "Reconocimiento automÃtico de enlaces"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-#: ../mail/evolution-mail.schemas.in.h:22
-msgid "Check incoming mail being junk"
-msgstr "Comprobar si el correo entrante es SPAM"
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Recognize links in text and replace them."
+msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Comprobar si Evolution es la aplicaciÃn de correo predeterminada"
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "Automatic emoticon recognition"
+msgstr "Reconocimiento automÃtico de emoticonos"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Citation highlight color"
-msgstr "Color de resaltado de citas"
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "Reconocer emoticonos en el texto y reemplazarlos con imÃgenes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-#: ../mail/evolution-mail.schemas.in.h:24
-msgid "Citation highlight color."
-msgstr "Color de resaltado de citas."
+msgid "Attribute message"
+msgstr "Atribuir mensaje"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
 msgid ""
-"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
-"text when replying to a message, as an addition to the standard \"Re\" "
-"prefix. An example is 'SV,AV'."
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
 msgstr ""
-"Lista separada por comas de abreviaturas ÂRe traducidas que omitir en el "
-"texto del asunto al responder a un mensaje, aÃadidas al prefijo ÂRe "
-"estÃndar. Por ejemplo, ÂSV,AVÂ"
+"El texto insertado al responder a un mensaje, atribuyendo el mensaje a su "
+"autor original"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
-msgid "Composer load/attach directory"
-msgstr "Carpeta de carga/adjuntos del editor"
+msgid "Forward message"
+msgstr "Reenviar mensaje"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Comprimir la visualizaciÃn de direcciones en A/CC/CCO"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
-#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
 msgstr ""
-"Comprime la visualizaciÃn de direcciones en A/CC/CCO al nÃmero especificado "
-"en address_count."
+"El texto insertado al reenviar un mensaje, diciendo que a continuaciÃn està "
+"el mensaje reenviado"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+msgid "Original message"
+msgstr "Mensaje original"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
-#: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
 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."
+"El texto insertado al responder a un mensaje (publicando por encima), "
+"diciendo que el a continuaciÃn està el mensaje reenviado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-#: ../mail/evolution-mail.schemas.in.h:30
-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:9
+msgid "Group Reply replies to list"
+msgstr "Responder al grupo responde a la lista"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
+"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 "
+"which you happened to receive the copy of the message to which you're "
+"replying."
 msgstr ""
-"Cabeceras personalizadas que usar para comprobar si es SPAM. La lista de "
-"elementos son cadenas con el formato \"headername=valor\"."
+"En lugar del comportamiento normal de ÂResponder a todosÂ, esta opciÃn harà "
+"que el botÃn ÂResponder al grupo de la barra de herramientas intente "
+"responder sÃlo a la lista de correo a travÃs de la que recibe copias de los "
+"correos a los que està respondiendo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default charset in which to compose messages"
-msgstr "Conjunto de caracteres predeterminado para redactar mensajes"
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Put the cursor at the bottom of replies"
+msgstr "Comenzar a escribir en la parte final al responder"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Default charset in which to compose messages."
-msgstr "Conjunto de caracteres predeterminado para redactar mensajes."
+#: ../mail/evolution-mail.schemas.in.h:14
+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 "
+"message or the bottom."
+msgstr ""
+"Los usuarios se indignan acerca de dÃnde debe ir el cursor al responder un "
+"mensaje. Esto determina si el cursor se posiciona en la parte superior del "
+"mensaje o en la inferior."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-#: ../mail/evolution-mail.schemas.in.h:34
-msgid "Default charset in which to display messages"
-msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid "Always request read receipt"
+msgstr "Siempre solicitar confirmaciÃn de lectura"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#: ../mail/evolution-mail.schemas.in.h:35
-msgid "Default charset in which to display messages."
-msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-#: ../mail/evolution-mail.schemas.in.h:36
-msgid "Default forward style"
-msgstr "Estilo de reenvÃo predeterminado"
+#: ../mail/evolution-mail.schemas.in.h:16
+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."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Send HTML mail by default"
+msgstr "Enviar correo en HTML de forma predeterminada"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-#: ../mail/evolution-mail.schemas.in.h:41
-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:18
+msgid "Send HTML mail by default."
+msgstr "Enviar el correo en HTML de forma predeterminada."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded and \"1\" = collapsed"
-msgstr ""
-"Describe si las cabeceras del mensajes en la vista con paneles se deben "
-"contraer o expandir de manera predeterminada. Â0Â = expandidas Â1Â = contraÃdas"
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Spell checking color"
+msgstr "Color de la correcciÃn ortogrÃfica"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
-"Determina si se deben buscar direcciones para filtrar SPAM sÃlo en la "
-"libreta de direcciones local"
+"Color de subrayado para las palabras mal escritas cuando se use correcciÃn "
+"en lÃnea."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:47
-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:21
+msgid "Spell checking languages"
+msgstr "ComprobaciÃn ortogrÃfica de idiomas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-#: ../mail/evolution-mail.schemas.in.h:48
-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 "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid "List of dictionary language codes used for spell checking."
 msgstr ""
-"Determina si se debe buscar la direcciÃn del remitente en la libreta de "
-"direcciones. Si se encuentra, no se debe marcar como SPAM. Busca en las "
-"libretas marcadas para autocompletado. Puede ser lento si se han marcado "
-"para autocompletado libretas de direcciones remotas (como LDAP)."
+"Lista de los cÃdigos de diccionario usados para la correcciÃn ortogrÃfica."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-#: ../mail/evolution-mail.schemas.in.h:49
-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:23
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "Mostrar el campo ÂCco al enviar un mensaje de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:24
 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 "
-"checking speed."
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr ""
-"Determina si se deben usar cabeceras personalizadas para comprobar si es "
-"SPAM. Si esta opciÃn està activada y las cabeceras se mencionan, se mejorarà "
-"la velocidad de comprobado de correo basura."
+"Mostrar el campo ÂCco al enviar un mensaje de correo. Esto se controla desde "
+"el menà Ver cuando se elige una cuenta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
-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:25
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "Mostrar el campo ÂCc al enviar un mensaje de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 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."
+"Mostrar el campo ÂCc al enviar un mensaje de correo. Esto se controla desde "
+"el menà Ver cuando se elige una cuenta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-msgid "Digitally sign replies when the original message is signed"
-msgstr ""
-"Firmar las respuestas digitalmente cuando el mensaje original esteÌ firmado"
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Mostrar el campo ÂResponder a al enviar un mensaje de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-msgid "Directory for loading/attaching files to composer."
-msgstr "Carpeta para cargar/adjuntar archivos en el editor."
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#: ../mail/evolution-mail.schemas.in.h:53
-msgid "Directory for saving mail component files."
-msgstr "Carpeta para guardar archivos enviados por correo."
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "Mostrar el campo ÂDe al publicar en un grupo de noticias"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#: ../mail/evolution-mail.schemas.in.h:54
-msgid "Disable or enable ellipsizing of folder names in side bar"
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
 msgstr ""
-"Desactivar o activar la elipsis de los nombres de las carpetas en la barra "
-"lateral"
+"Mostrar el campo ÂDe al enviar un mensaje de correo. Esto se controla desde "
+"el menà Ver cuando se elige una cuenta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#: ../mail/evolution-mail.schemas.in.h:55
-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:31
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "Mostrar el campo ÂResponder a al publicar en un grupo de noticias"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Do not add signature delimiter"
-msgstr "No aÃadir un delimitador de firma"
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-#: ../mail/evolution-mail.schemas.in.h:58
-msgid "Draw spelling error indicators on words as you type."
+msgid "Digitally sign replies when the original message is signed"
 msgstr ""
-"Dibujar indicadores de errores tipogrÃficos en las palabras mientras se "
-"escribe."
+"Firmar las respuestas digitalmente cuando el mensaje original esteÌ firmado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#: ../mail/evolution-mail.schemas.in.h:59
-msgid "Empty Junk folders on exit"
-msgstr "Vaciar las carpetas SPAM al salir"
+#: ../mail/evolution-mail.schemas.in.h:12
+msgid ""
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
+msgstr ""
+"Activar las firmas PGP o S/MIME automaÌticamente al responder a un mensaje "
+"firmado con PGP o S/MIME."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#: ../mail/evolution-mail.schemas.in.h:60
-msgid "Empty Trash folders on exit"
-msgstr "Vaciar papeleras al salir"
+#: ../mail/evolution-mail.schemas.in.h:33 ../mail/mail-config.ui.h:15
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "Codificar nombres de archivo de la forma Outlook/GMail"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#: ../mail/evolution-mail.schemas.in.h:61
-msgid "Empty all Junk folders when exiting Evolution."
-msgstr "Vaciar todas las carpetas SPAM al salir de Evolution."
+#: ../mail/evolution-mail.schemas.in.h:34
+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, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+"Codificar los nombres de archivo en las cabeceras del correo de la misma "
+"forma que Outlook y GMail, para hacerles entender los nombres de archivo "
+"localizados enviados por Evolution, ya que no siguen el RFC 2231, pero usan "
+"el estÃndar incorrecto RFC 2047."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Vaciar todas las papeleras al salir de Evolution."
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid "Put personalized signatures at the top of replies"
+msgstr "Poner firmas personalizas en la parte superior de las respuestas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+"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 "
+"the message or the bottom."
 msgstr ""
-"Activar imÃgenes animadas en correos HTML. Muchos usuarios consideran "
-"molestas las imÃgenes animadas y prefieren ver una imagen estÃtica."
+"Los usuarios se indignan acerca de dÃnde debe ir el la firma al responder un "
+"mensaje. Esto determina si la firma se ubica en la parte superior del "
+"mensaje o en la inferior."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#: ../mail/evolution-mail.schemas.in.h:64
-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:37
+msgid "Do not add signature delimiter"
+msgstr "No aÃadir un delimitador de firma"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-#: ../mail/evolution-mail.schemas.in.h:65
-msgid "Enable local folders"
-msgstr "Activar carpetas locales"
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+"EstablÃzcalo a verdadero si no quiere aÃadir un delimitador de firma antes "
+"de su firma al editar un correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#: ../mail/evolution-mail.schemas.in.h:66
-msgid "Enable or disable magic space bar"
-msgstr "Activa o desactiva la barra espaciadora mÃgica"
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Ignore list Reply-To:"
+msgstr "Ignorar ÂResponder a:Â para listas:"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-#: ../mail/evolution-mail.schemas.in.h:67
-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:44
+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. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+"Algunas listas de correo establecen una cabecera ÂResponder a:Â para forzar a "
+"los usuarios a responder a la lista, incluso cuando los usuarios piden que "
+"Evolution envÃe una respuesta privada. Establecer esta opciÃn a cierta "
+"intentarà ignorar tales cabeceras ÂResponder a:Â, de tal forma que Evolution "
+"haga lo que se le pide. Si usa la acciÃn de respuesta privada, responderà de "
+"forma privada, mientras que si usa la acciÃn ÂResponder a la lista harà eso "
+"mismo. Funciona comparando la cabecera ÂResponder a:Â con una cabecara ÂList-"
+"Post:Â, si existe."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid "Enable or disable type ahead search feature"
-msgstr "Activa o desactiva la caracterÃstica de bÃsqueda al teclear"
+msgid "List of localized 'Re'"
+msgstr "Lista de ÂRe traducidas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
-#: ../mail/evolution-mail.schemas.in.h:69
-msgid "Enable search folders"
-msgstr "Activar las carpetas de bÃsqueda"
+msgid ""
+"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard \"Re\" "
+"prefix. An example is 'SV,AV'."
+msgstr ""
+"Lista separada por comas de abreviaturas ÂRe traducidas que omitir en el "
+"texto del asunto al responder a un mensaje, aÃadidas al prefijo ÂRe "
+"estÃndar. Por ejemplo, ÂSV,AVÂ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Enable search folders on startup."
-msgstr "Activar las carpetas de bÃsqueda al inicio."
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Show image animations"
+msgstr "Mostrar imÃgenes animadas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
 msgstr ""
-"Activar la caracterÃstica barra de bÃsqueda lateral para permitir bÃsquedas "
-"interactivas de nombres de carpetas."
+"Activar imÃgenes animadas en correos HTML. Muchos usuarios consideran "
+"molestas las imÃgenes animadas y prefieren ver una imagen estÃtica."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-#: ../mail/evolution-mail.schemas.in.h:72
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
-"Activar esto para usar la barra espaciadora para desplazarse en la vista "
-"previa del mensaje, lista de mensajes y carpetas."
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Enable or disable type ahead search feature"
+msgstr "Activa o desactiva la caracterÃstica de bÃsqueda al teclear"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"Activar el mostrado exclusivo de mensajes de texto que no excedan el tamaÃo "
-"definido en la clave Âmessage_text_part_limitÂ."
+"Activar la caracterÃstica barra de bÃsqueda lateral para permitir bÃsquedas "
+"interactivas de nombres de carpetas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#: ../mail/evolution-mail.schemas.in.h:74
-msgid "Enable to use a similar message list view settings for all folders"
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
-"Activar para usar una ajuste de vista de lista de mensajes similar para "
-"todas las carpetas"
+"Desactivar o activar la elipsis de los nombres de las carpetas en la barra "
+"lateral"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#: ../mail/evolution-mail.schemas.in.h:75
-msgid "Enable to use a similar message list view settings for all folders."
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
-"Activar para usar una ajuste de vista de lista de mensajes similar para "
-"todas las carpetas."
+"Indica si se debe desactivar la caracterÃstica de elipsis de los nombres de "
+"las carpetas en la barra lateral."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:76
-msgid "Enable/disable caret mode"
-msgstr "Activar/desactivar modo cursor"
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Enable or disable magic space bar"
+msgstr "Activa o desactiva la barra espaciadora mÃgica"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:77 ../mail/mail-config.ui.h:48
-msgid "Encode file names in an Outlook/GMail way"
-msgstr "Codificar nombres de archivo de la forma Outlook/GMail"
+#: ../mail/evolution-mail.schemas.in.h:60
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+"Activar esto para usar la barra espaciadora para desplazarse en la vista "
+"previa del mensaje, lista de mensajes y carpetas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#: ../mail/evolution-mail.schemas.in.h:78
-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, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
-"Codificar los nombres de archivo en las cabeceras del correo de la misma "
-"forma que Outlook y GMail, para hacerles entender los nombres de archivo "
-"localizados enviados por Evolution, ya que no siguen el RFC 2231, pero usan "
-"el estÃndar incorrecto RFC 2047."
+"Activar para usar una ajuste de vista de lista de mensajes similar para "
+"todas las carpetas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
-"Cada vez que Evolution se inicie, comprobar si es o no el cliente de correo "
-"predeterminado."
+"Activar para usar una ajuste de vista de lista de mensajes similar para "
+"todas las carpetas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Flush Outbox after filtering"
-msgstr "Limpiar la bandeja de salida despuÃs de filtrar"
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid "Mark citations in the message \"Preview\""
+msgstr "Marcar citas textuales en la vista previa del mensaje"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-msgid "Forward message"
-msgstr "Reenviar mensaje"
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid "Mark citations in the message \"Preview\"."
+msgstr "Marcar citas textuales en la Âvista previa del mensaje."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid "Group Reply replies to list"
-msgstr "Responder al grupo responde a la lista"
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Citation highlight color"
+msgstr "Color de resaltado de citas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Height of the message-list pane"
-msgstr "Altura del panel de lista de mensajes"
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Citation highlight color."
+msgstr "Color de resaltado de citas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:85
-msgid "Height of the message-list pane."
-msgstr "Altura del panel de vista de mensajes."
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Enable/disable caret mode"
+msgstr "Activar/desactivar modo cursor"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#: ../mail/evolution-mail.schemas.in.h:86
-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:68
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-#: ../mail/evolution-mail.schemas.in.h:87
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-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:69
+msgid "Default charset in which to display messages"
+msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#: ../mail/evolution-mail.schemas.in.h:88
-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 "
-"in GNOME's MIME type database may be used for displaying content."
-msgstr ""
-"Si no hay un visor integrado para un tipo mime particular dentro de "
-"Evolution, cualquier tipo mime que aparezca en esta lista que se mapee a un "
-"visor de componentes bonobo en la base de datos de GNOME puede usarse para "
-"mostrar el contenido."
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Default charset in which to display messages."
+msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-#: ../mail/evolution-mail.schemas.in.h:89
-msgid "Ignore list Reply-To:"
-msgstr "Ignorar ÂResponder a:Â para listas:"
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Load images for HTML messages over HTTP"
+msgstr "Cargar imÃgenes para mensajes HTML sobre HTTP"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:72
 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 "
-"which you happened to receive the copy of the message to which you're "
-"replying."
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
-"En lugar del comportamiento normal de ÂResponder a todosÂ, esta opciÃn harà "
-"que el botÃn ÂResponder al grupo de la barra de herramientas intente "
-"responder sÃlo a la lista de correo a travÃs de la que recibe copias de los "
-"correos a los que està respondiendo."
+"Cargar imÃgenes de los mensajes HTML sobre http(s). Los valores posibles "
+"son: Â0Â: Nunca cargar imÃgenes desde la red; Â1Â: Cargar imÃgenes si el "
+"remitente està en la libreta de direcciones; Â2Â: Siempre cargar imÃgenes "
+"desde la red."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-#: ../mail/evolution-mail.schemas.in.h:103
-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 "
-"the search results."
-msgstr ""
-"Desactiva o activa los mensajes repetitivos de advertencia de que eliminar "
-"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:73
+msgid "Show Animations"
+msgstr "Mostrar animaciones"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-#: ../mail/evolution-mail.schemas.in.h:104
-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."
-msgstr ""
-"Desactiva o activa los mensajes repetitivos de advertencia para avisarle de "
-"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:74
+msgid "Show animated images as animations."
+msgstr "Mostrar las imÃgenes animadas como animaciones."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-#: ../mail/evolution-mail.schemas.in.h:105
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-msgstr ""
-"Desactiva o activa los mensajes repetitivos para avisarle de que està "
-"enviando una respuesta a mucha gente."
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "Show all message headers"
+msgstr "Mostrar todas las cabeceras del mensaje"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-#: ../mail/evolution-mail.schemas.in.h:106
-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 "
-"sets a Reply-To: header which redirects your reply back to the list"
-msgstr ""
-"Desactiva o activa los mensajes repetitivos para avisarle de que està "
-"intentando enviar una respuesta privada a un correo que llegà a travÃs de "
-"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:76
+msgid "Show all the headers when viewing a messages."
+msgstr "Mostrar todas las cabeceras al ver mensajes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-#: ../mail/evolution-mail.schemas.in.h:107
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
-msgstr ""
-"Desactiva o activa los mensajes repetitivos de advertencia para avisarle de "
-"que està enviando un mensaje a destinatarios no introducidos como una "
-"direcciÃn de correo"
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "List of custom headers and whether they are enabled."
+msgstr "Lista de cabeceras personalizadas y si estÃn activadas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-#: ../mail/evolution-mail.schemas.in.h:108
-msgid "Last time Empty Junk was run"
-msgstr "Ãltima vez que se vacià el SPAM"
+#: ../mail/evolution-mail.schemas.in.h:78
+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;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"Esta clave deberÃa contener una lista de estructuras XML especificando "
+"cabeceras personalizadas, e indicando si deben mostrarse. El formato de la "
+"estructura XML es &lt;header enabled&gt;: poner a activado si la cabecera se "
+"debe mostrar en la vista de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-#: ../mail/evolution-mail.schemas.in.h:109
-msgid "Last time Empty Trash was run"
-msgstr "Ãltima vez que se vacià la papelera"
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Show photo of the sender"
+msgstr "Mostrar la foto del remitente"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#: ../mail/evolution-mail.schemas.in.h:110
-msgid "Layout style"
-msgstr "Estilo de la distribuciÃn"
+#: ../mail/evolution-mail.schemas.in.h:80
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-#: ../mail/evolution-mail.schemas.in.h:111
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Level beyond which the message should be logged."
-msgstr "Nivel mÃs allà del cuÃl el mensaje se debe registrar."
-
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Search for the sender photo in local address books"
+msgstr "Buscar la foto del remitente en libretas de direcciones locales"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-#: ../mail/evolution-mail.schemas.in.h:112
-msgid "List of Labels and their associated colors"
-msgstr "Lista de etiquetas y sus colores asociados"
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "This option would help in improving the speed of fetching."
+msgstr "Esta opciÃn ayudarà a mejorar la velocidad de obtenciÃn."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Lista de tipos MIME de comprobaciÃn de visores de componentes Bonobo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-#: ../mail/evolution-mail.schemas.in.h:117
-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:84
+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 "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+"Si no hay un visor integrado para un tipo mime particular dentro de "
+"Evolution, cualquier tipo mime que aparezca en esta lista que se mapee a un "
+"visor de componentes bonobo en la base de datos de GNOME puede usarse para "
+"mostrar el contenido."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-#: ../mail/evolution-mail.schemas.in.h:118
-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:85
+msgid "Mark as Seen after specified timeout"
+msgstr "Marcar como visto despuÃs del tiempo especificado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-#: ../mail/evolution-mail.schemas.in.h:119
-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."
-msgstr ""
-"Lista de etiquetas conocidas para el componente de correo de Evolution. La "
-"lista contiene cadenas con el nombre:color donde color usa la codificaciÃn "
-"hex HTML."
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Mark as Seen after specified timeout."
+msgstr "Marcar como visto despuÃs del tiempo especificado."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-msgid "List of localized 'Re'"
-msgstr "Lista de ÂRe traducidas"
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Timeout for marking message as seen"
+msgstr "Tiempo para marcar un mensaje como visto"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-#: ../mail/evolution-mail.schemas.in.h:121
-msgid "Load images for HTML messages over HTTP"
-msgstr "Cargar imÃgenes para mensajes HTML sobre HTTP"
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid "Timeout for marking message as seen."
+msgstr "Tiempo para marcar un mensaje como visto."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-#: ../mail/evolution-mail.schemas.in.h:122
-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 "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"Cargar imÃgenes de los mensajes HTML sobre http(s). Los valores posibles "
-"son: Â0Â: Nunca cargar imÃgenes desde la red; Â1Â: Cargar imÃgenes si el "
-"remitente està en la libreta de direcciones; Â2Â: Siempre cargar imÃgenes "
-"desde la red."
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Sender email-address column in the message list"
+msgstr "Columna del correo-e del remitente en la lista de mensajes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid "Log filter actions"
-msgstr "Registrar acciones de filtrado"
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+"Mostrar el correo-e del remitente en una columna separada en la lista de "
+"mensajes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
-#: ../mail/evolution-mail.schemas.in.h:124
-msgid "Log filter actions to the specified log file."
-msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view"
+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"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-#: ../mail/evolution-mail.schemas.in.h:125
-msgid "Logfile to log filter actions"
-msgstr "Archivo de registro para registrar las acciones de filtrado"
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Logfile to log filter actions."
-msgstr "Archivo de registro para registrar las acciones de filtrado."
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Show deleted messages in the message-list"
+msgstr "Mostrar los mensajes borrados en la lista de mensajes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Mark as Seen after specified timeout"
-msgstr "Marcar como visto despuÃs del tiempo especificado"
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr "Mostrar los mensajes borrados (tachados) en la lista de mensajes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Mark as Seen after specified timeout."
-msgstr "Marcar como visto despuÃs del tiempo especificado."
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid "Enable local folders"
+msgstr "Activar carpetas locales"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Mark citations in the message \"Preview\""
-msgstr "Marcar citas textuales en la vista previa del mensaje"
+msgid "Whether to show local folders (On This Computer) in a folder tree"
+msgstr ""
+"Indica si se deben mostrar las carpetas locales (En este equipo) en un Ãrbol "
+"de carpetas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Mark citations in the message \"Preview\"."
-msgstr "Marcar citas textuales en la Âvista previa del mensaje."
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Enable search folders"
+msgstr "Activar las carpetas de bÃsqueda"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Message text limit for display"
-msgstr "LÃmite del texto del mensaje para mostrarlo"
+#: ../mail/evolution-mail.schemas.in.h:95
+msgid "Enable search folders on startup."
+msgstr "Activar las carpetas de bÃsqueda al inicio."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-#: ../mail/evolution-mail.schemas.in.h:135
-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:98
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Oculta la vista previa por carpeta y elimina la selecciÃn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-#: ../mail/evolution-mail.schemas.in.h:136
-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:99
+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."
+msgstr ""
+"Esta clave es de una sola lectura y despuÃs de leerla se establece a ÂfalseÂ. "
+"Esto deselecciona el correo en la lista y elimina la vista previa para esa "
+"carpeta."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
-#: ../mail/evolution-mail.schemas.in.h:137
-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:100
+msgid "Height of the message-list pane"
+msgstr "Altura del panel de lista de mensajes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
-#: ../mail/evolution-mail.schemas.in.h:138
-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:101
+msgid "Height of the message-list pane."
+msgstr "Altura del panel de vista de mensajes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-#: ../mail/evolution-mail.schemas.in.h:139
-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:126
+msgid "State of message headers in paned view"
+msgstr "Estado de las cabeceras del mensaje en la vista con paneles"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "NÃmero de direcciones a mostrar en PARA/CC/CCO"
+msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded and \"1\" = collapsed"
+msgstr ""
+"Describe si las cabeceras del mensajes en la vista con paneles se deben "
+"contraer o expandir de manera predeterminada. Â0Â = expandidas Â1Â = contraÃdas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-msgid "Original message"
-msgstr "Mensaje original"
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Width of the message-list pane"
+msgstr "Anchura del panel de lista de mensajes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid "Path where picture gallery should search for its content"
-msgstr "Ruta donde la galerÃa de imÃgenes deberÃa buscar su contenido"
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Width of the message-list pane."
+msgstr "Anchura del panel de lista de mensajes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-msgid ""
-"Possible values are: 'never' - to never close browser window, 'always' - to "
-"always close browser window or '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 "
-"o Âask (preguntar) o cualquier otro valor, preguntarÃn al usuario."
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Layout style"
+msgstr "Estilo de la distribuciÃn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid "Prompt before sending to recipients not entered as mail addresses"
+#: ../mail/evolution-mail.schemas.in.h:105
+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 "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
 msgstr ""
-"Preguntar antes de enviar a los destinatarios no introducidos como "
-"direcciones de correo"
+"El estilo de la distribuciÃn determina dÃnde ubicar el panel de vista previa "
+"en relaciÃn con la lista de correos. Â0Â (vista clÃsica) ubica el panel de "
+"vista previa debajo de la lista de correos. Â1Â (vista vertical) ubica el "
+"panel de vista previa junto a la lista de correos."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-#: ../mail/evolution-mail.schemas.in.h:145
-msgid "Prompt on empty subject"
-msgstr "Preguntar si el asunto està en blanco"
+#: ../mail/evolution-mail.schemas.in.h:106
+msgid "Variable width font"
+msgstr "TipografÃa de anchura variable"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-msgid "Prompt the user when he or she tries to empty the trash."
-msgstr "Preguntar al usuario cuando intente vaciar la papelera."
+#: ../mail/evolution-mail.schemas.in.h:107
+msgid "The variable width font for mail display."
+msgstr "La tipografÃa de anchura variable para mostrar el correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-#: ../mail/evolution-mail.schemas.in.h:146
-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:108
+msgid "Terminal font"
+msgstr "TipografÃa del terminal"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-#: ../mail/evolution-mail.schemas.in.h:147
-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:109
+msgid "The terminal font for mail display."
+msgstr "La tipografÃa de terminal para mostrar el correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-#: ../mail/evolution-mail.schemas.in.h:148
-msgid "Prompt when deleting messages in search folder"
-msgstr "Preguntar al eliminar correos en carpetas de bÃsqueda"
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Use custom fonts"
+msgstr "Usar tipografÃa personalizada"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-msgid "Prompt when emptying the trash"
-msgstr "Preguntar al vaciar la papelera"
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "Use custom fonts for displaying mail."
+msgstr "Usar tipografÃa personalizada para mostrar el correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-#: ../mail/evolution-mail.schemas.in.h:149
-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:112
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr "Comprimir la visualizaciÃn de direcciones en A/CC/CCO"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-#: ../mail/evolution-mail.schemas.in.h:150
-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:113
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"Comprime la visualizaciÃn de direcciones en A/CC/CCO al nÃmero especificado "
+"en address_count."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Prompt when replying to many recipients"
-msgstr "Preguntar al responder a muchos desinatarios"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Display only message texts not exceeding certain size"
+msgstr "Mostrar sÃlo los mensajes de texto que no excedan de cierto tamaÃo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid "Prompt when user expunges"
-msgstr "Preguntar cuando el usuario compacte"
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"Activar el mostrado exclusivo de mensajes de texto que no excedan el tamaÃo "
+"definido en la clave Âmessage_text_part_limitÂ."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-#: ../mail/evolution-mail.schemas.in.h:153
-msgid "Prompt when user only fills Bcc"
-msgstr "Preguntar cuando el usuario sÃlo rellene el campo Cco"
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Message text limit for display"
+msgstr "LÃmite del texto del mensaje para mostrarlo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-#: ../mail/evolution-mail.schemas.in.h:154
-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:117
+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 "
+"is used only when 'force_message_limit' key is activated."
+msgstr ""
+"Esto decide el tamaÃo mÃximo de la parte de texto que se puede formatear "
+"bajo Evolution, especificado en tÃrminos de KB. Lo predeterminado son 4096 "
+"(4MiB). Este valor sÃlo se usa cuando la clave 'force_message_limit' està "
+"activada."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-#: ../mail/evolution-mail.schemas.in.h:155
-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:118
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr "NÃmero de direcciones a mostrar en PARA/CC/CCO"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
 msgstr ""
-"Preguntar cuando el usuario intente enviar un mensaje sin destinatarios Para "
-"o Cc."
+"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 ÂâÂ."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-#: ../mail/evolution-mail.schemas.in.h:157
-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:120
+msgid "Thread the message-list based on Subject"
+msgstr "Agrupar la lista de mensajes en conversaciones basadas en el asunto"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "Prompt while marking multiple messages"
-msgstr "Preguntar cuando se marquen varios correos"
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+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Â."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
-#: ../mail/evolution-mail.schemas.in.h:159
-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:122
+msgid "Default value for thread expand state"
+msgstr "Valor predeterminado para el estado de expansiÃn de la conversaciÃn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "Put the cursor at the bottom of replies"
-msgstr "Comenzar a escribir en la parte final al responder"
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"Este ajuste especifica si las conversaciones, de forma predeterminada, "
+"deberÃan estar en estado expandido o contraÃdo. Evolution necesita "
+"reiniciarse para aplicarlo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
-#: ../mail/evolution-mail.schemas.in.h:161
-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:124
+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"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-#: ../mail/evolution-mail.schemas.in.h:162
-msgid "Recognize links in text and replace them."
-msgstr "Reconocer enlaces en el texto y reemplazarlos."
+#: ../mail/evolution-mail.schemas.in.h:125
+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 "
+"restart."
+msgstr ""
+"Este ajuste especifica si las conversaciones se deberÃan ordenar en base al "
+"Ãltimo mensaje de cada conversaciÃn, en lugar de por la fecha del mensaje. "
+"Evolution necesita un reinicio."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
-#: ../mail/evolution-mail.schemas.in.h:163
-msgid "Run junk test on incoming mail."
-msgstr "Ejecutar la prueba de SPAM en el correo entrante."
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr "Ordenar cuentas alfabÃticamente en un Ãrbol de carpetas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
-#: ../mail/evolution-mail.schemas.in.h:164
-msgid "Save directory"
-msgstr "Carpeta donde guardar"
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user"
+msgstr ""
+"Indica cÃmo ordenar cuentas en un Ãrbol de carpetas usado en una vista de "
+"Correo. Cuando està establecido a cierto las cuentas se ordenan "
+"alfabÃticamente, con la excepciÃn de En este equipo y Carpetas de bÃsqueda, "
+"de lo contrario las carpetas se ordenan por el orden dado por el usuario"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
-#: ../mail/evolution-mail.schemas.in.h:165
-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:142
+msgid "Log filter actions"
+msgstr "Registrar acciones de filtrado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Send HTML mail by default"
-msgstr "Enviar correo en HTML de forma predeterminada"
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Log filter actions to the specified log file."
+msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "Send HTML mail by default."
-msgstr "Enviar el correo en HTML de forma predeterminada."
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "Logfile to log filter actions"
+msgstr "Archivo de registro para registrar las acciones de filtrado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#: ../mail/evolution-mail.schemas.in.h:168
-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:145
+msgid "Logfile to log filter actions."
+msgstr "Archivo de registro para registrar las acciones de filtrado."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Server synchronization interval"
-msgstr "Intervalo de sincronizaciÃn con el servidor"
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Flush Outbox after filtering"
+msgstr "Limpiar la bandeja de salida despuÃs de filtrar"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
 msgstr ""
-"EstablÃzcalo a verdadero si no quiere aÃadir un delimitador de firma antes "
-"de su firma al editar un correo."
+"Indica si se debe limpiar la bandeja de salida despuÃs de finalizar el "
+"filtrado. La limpieza de la bandeja de salida sÃlo sucede cuando se usà "
+"algÃn filtro de acciÃn ÂReenviar a y, aproximadamente, un minuto despuÃs de "
+"la Ãltima invocaciÃn a una acciÃn."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
-#: ../mail/evolution-mail.schemas.in.h:171
-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:148
+msgid "Default forward style"
+msgstr "Estilo de reenvÃo predeterminado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-#: ../mail/evolution-mail.schemas.in.h:172
-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:150
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr ""
+"Estilo de visualizaciÃn del mensaje (\"normal\", \"full headers\" (cabeceras "
+"completas), \"source\" (fuente))"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-#: ../mail/evolution-mail.schemas.in.h:173
-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:151
+msgid "Prompt on empty subject"
+msgstr "Preguntar si el asunto està en blanco"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-#: ../mail/evolution-mail.schemas.in.h:174
-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:152
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "Mostrar el campo ÂResponder a al enviar un mensaje de correo"
+msgid "Prompt when emptying the trash"
+msgstr "Preguntar al vaciar la papelera"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Show Animations"
-msgstr "Mostrar animaciones"
+msgid "Prompt the user when he or she tries to empty the trash."
+msgstr "Preguntar al usuario cuando intente vaciar la papelera."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Show all message headers"
-msgstr "Mostrar todas las cabeceras del mensaje"
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Prompt when user expunges"
+msgstr "Preguntar cuando el usuario compacte"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Show all the headers when viewing a messages."
-msgstr "Mostrar todas las cabeceras al ver mensajes."
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr "Preguntar al usuario cuando intente purgar una carpeta."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid "Show animated images as animations."
-msgstr "Mostrar las imÃgenes animadas como animaciones."
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr ""
+"Preguntar antes de enviar a los destinatarios no introducidos como "
+"direcciones de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
-#: ../mail/evolution-mail.schemas.in.h:180
-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:174
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr ""
+"Desactiva o activa los mensajes repetitivos de advertencia para avisarle de "
+"que està enviando un mensaje a destinatarios no introducidos como una "
+"direcciÃn de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid "Show deleted messages in the message-list"
-msgstr "Mostrar los mensajes borrados en la lista de mensajes"
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "Prompt when user only fills Bcc"
+msgstr "Preguntar cuando el usuario sÃlo rellene el campo Cco"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-#: ../mail/evolution-mail.schemas.in.h:182
-msgid "Show image animations"
-msgstr "Mostrar imÃgenes animadas"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
-#: ../mail/evolution-mail.schemas.in.h:183
-msgid "Show original \"Date\" header value."
-msgstr "Mostrar el valor original de la cabecera ÂFechaÂ."
+#: ../mail/evolution-mail.schemas.in.h:156
+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."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr "Preguntar cuando el usuario intente enviar HTML no deseado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-#: ../mail/evolution-mail.schemas.in.h:184
-msgid "Show photo of the sender"
-msgstr "Mostrar la foto del remitente"
+#: ../mail/evolution-mail.schemas.in.h:158
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
-#: ../mail/evolution-mail.schemas.in.h:185
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-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:159
+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"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
 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."
+"Si el usuario intenta abrir diez o mÃs mensajes al mismo tiempo, preguntar "
+"al usuario si quiere realmente hacerlo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-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:161
+msgid "Prompt while marking multiple messages"
+msgstr "Preguntar cuando se marquen varios correos"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#: ../mail/evolution-mail.schemas.in.h:188
-msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
-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:162
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Activar o desactivar la pregunta cuando se marcan varios mensajes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
-#: ../mail/evolution-mail.schemas.in.h:189
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
-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:163
+msgid "Prompt when deleting messages in search folder"
+msgstr "Preguntar al eliminar correos en carpetas de bÃsqueda"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
 msgstr ""
-"Mostrar el correo-e del remitente en una columna separada en la lista de "
-"mensajes."
+"Desactiva o activa los mensajes repetitivos de advertencia de que eliminar "
+"correos de una carpeta de bÃsqueda borra permanentemente el correo, no sÃlo "
+"los elimina de los resultados de la bÃsqueda."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
-#: ../mail/evolution-mail.schemas.in.h:191
-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 "
-"format and local time zone."
-msgstr ""
-"Mostrar el valor original de la cabecera ÂFecha (sÃlo con la hora local si "
-"las zonas horarias difieren). De otra forma mostrar siempre el valor de la "
-"cabecera ÂFecha en el formato preferido por el usuario para la fecha y hora "
-"locales."
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid "Prompt when replying privately to list messages"
+msgstr "Preguntar al responder de forma privada a correos de una lista"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-#: ../mail/evolution-mail.schemas.in.h:192
-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."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:166
 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. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
 msgstr ""
-"Algunas listas de correo establecen una cabecera ÂResponder a:Â para forzar a "
-"los usuarios a responder a la lista, incluso cuando los usuarios piden que "
-"Evolution envÃe una respuesta privada. Establecer esta opciÃn a cierta "
-"intentarà ignorar tales cabeceras ÂResponder a:Â, de tal forma que Evolution "
-"haga lo que se le pide. Si usa la acciÃn de respuesta privada, responderà de "
-"forma privada, mientras que si usa la acciÃn ÂResponder a la lista harà eso "
-"mismo. Funciona comparando la cabecera ÂResponder a:Â con una cabecara ÂList-"
-"Post:Â, si existe."
+"Desactiva o activa los mensajes repetitivos de advertencia para avisarle de "
+"que està enviando una respuesta privada a un correo que llegà a travÃs de "
+"una lista de correo."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Preguntar cuando la lista de correo secuestre las respuestas privadas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-#: ../mail/evolution-mail.schemas.in.h:194
-msgid "Sort accounts alphabetically in a folder tree"
-msgstr "Ordenar cuentas alfabÃticamente en un Ãrbol de carpetas"
+#: ../mail/evolution-mail.schemas.in.h:168
+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 "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+"Desactiva o activa los mensajes repetitivos para avisarle de que està "
+"intentando enviar una respuesta privada a un correo que llegà a travÃs de "
+"una lista de correo, pero la lista establece una cabecera ÂResponder a:Â que "
+"redirecciona su respuesta de nuevo a la lista."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-#: ../mail/evolution-mail.schemas.in.h:195
-msgid "Spell check inline"
-msgstr "ComprobaciÃn ortogrÃfica en lÃnea"
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "Prompt when replying to many recipients"
+msgstr "Preguntar al responder a muchos desinatarios"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-#: ../mail/evolution-mail.schemas.in.h:196
-msgid "Spell checking color"
-msgstr "Color de la correcciÃn ortogrÃfica"
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"Desactiva o activa los mensajes repetitivos para avisarle de que està "
+"enviando una respuesta a mucha gente."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
-#: ../mail/evolution-mail.schemas.in.h:197
-msgid "Spell checking languages"
-msgstr "ComprobaciÃn ortogrÃfica de idiomas"
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
+msgstr ""
+"Preguntar si cerrar la ventana del mensaje cuando el usuario reenvÃa o "
+"responde al mensaje mostrado en la ventana"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
-#: ../mail/evolution-mail.schemas.in.h:198
-msgid "State of message headers in paned view"
-msgstr "Estado de las cabeceras del mensaje en la vista con paneles"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user"
+"Possible values are: 'never' - to never close browser window, 'always' - to "
+"always close browser window or 'ask' - (or any other value) will ask user."
 msgstr ""
-"Indica cÃmo ordenar cuentas en un Ãrbol de carpetas usado en una vista de "
-"Correo. Cuando està establecido a cierto las cuentas se ordenan "
-"alfabÃticamente, con la excepciÃn de En este equipo y Carpetas de bÃsqueda, "
-"de lo contrario las carpetas se ordenan por el orden dado por el usuario"
+"Los valores posibles son: Ânever (nunca) para no cerrar nunca la ventana del "
+"examinador; Âalways (siempre) para cerrar siempre la ventana del examinador "
+"o Âask (preguntar) o cualquier otro valor, preguntarÃn al usuario."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Empty Trash folders on exit"
+msgstr "Vaciar papeleras al salir"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-#: ../mail/evolution-mail.schemas.in.h:200
-msgid "Terminal font"
-msgstr "TipografÃa del terminal"
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Vaciar todas las papeleras al salir de Evolution."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
-#: ../mail/evolution-mail.schemas.in.h:201
-msgid "The default plugin for Junk hook"
-msgstr "El complemento predeterminado para SPAM"
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid "Minimum days between emptying the trash on exit"
+msgstr "DÃas mÃnimos entre el vaciado de la papelera a la salida"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
-#: ../mail/evolution-mail.schemas.in.h:202
-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:178
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Last time Empty Trash was run"
+msgstr "Ãltima vez que se vacià la papelera"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:180
 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)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
-#: ../mail/evolution-mail.schemas.in.h:204
-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 "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
-msgstr ""
-"El estilo de la distribuciÃn determina dÃnde ubicar el panel de vista previa "
-"en relaciÃn con la lista de correos. Â0Â (vista clÃsica) ubica el panel de "
-"vista previa debajo de la lista de correos. Â1Â (vista vertical) ubica el "
-"panel de vista previa junto a la lista de correos."
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
-#: ../mail/evolution-mail.schemas.in.h:205
-msgid "The terminal font for mail display."
-msgstr "La tipografÃa de terminal para mostrar el correo."
+#: ../mail/evolution-mail.schemas.in.h:181
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows"
-msgstr ""
-"El texto insertado al reenviar un mensaje, diciendo que a continuaciÃn està "
-"el mensaje reenviado"
+#: ../mail/evolution-mail.schemas.in.h:182
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Level beyond which the message should be logged."
+msgstr "Nivel mÃs allà del cuÃl el mensaje se debe registrar."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows"
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"El texto insertado al responder a un mensaje (publicando por encima), "
-"diciendo que el a continuaciÃn està el mensaje reenviado"
+"Esto puede tener tres valores posibles. Â0Â para errores. Â1Â para avisos. Â2Â "
+"para mensajes de depuraciÃn."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author"
-msgstr ""
-"El texto insertado al responder a un mensaje, atribuyendo el mensaje a su "
-"autor original"
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Show original \"Date\" header value."
+msgstr "Mostrar el valor original de la cabecera ÂFechaÂ."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "The variable width font for mail display."
-msgstr "La tipografÃa de anchura variable para mostrar el correo."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
+"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 "
+"format and local time zone."
 msgstr ""
-"Esto puede tener tres valores posibles. Â0Â para errores. Â1Â para avisos. Â2Â "
-"para mensajes de depuraciÃn."
+"Mostrar el valor original de la cabecera ÂFecha (sÃlo con la hora local si "
+"las zonas horarias difieren). De otra forma mostrar siempre el valor de la "
+"cabecera ÂFecha en el formato preferido por el usuario para la fecha y hora "
+"locales."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:186
+msgid "List of Labels and their associated colors"
+msgstr "Lista de etiquetas y sus colores asociados"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:187
 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 "
-"is used only when 'force_message_limit' key is activated."
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
-"Esto decide el tamaÃo mÃximo de la parte de texto que se puede formatear "
-"bajo Evolution, especificado en tÃrminos de KB. Lo predeterminado son 4096 "
-"(4MiB). Este valor sÃlo se usa cuando la clave 'force_message_limit' està "
-"activada."
+"Lista de etiquetas conocidas para el componente de correo de Evolution. La "
+"lista contiene cadenas con el nombre:color donde color usa la codificaciÃn "
+"hex HTML."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-#: ../mail/evolution-mail.schemas.in.h:212
-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 "
-"to the other available plugins."
-msgstr ""
-"Este es el complemento predeterminado para el correo basura, aunque hay "
-"varios complementos activados. Si el complemento predeterminado listado està "
-"desactivado, entonces no usarà los otros complementos disponibles."
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "Check incoming mail being junk"
+msgstr "Comprobar si el correo entrante es SPAM"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-#: ../mail/evolution-mail.schemas.in.h:213
-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."
-msgstr ""
-"Esta clave es de una sola lectura y despuÃs de leerla se establece a ÂfalseÂ. "
-"Esto deselecciona el correo en la lista y elimina la vista previa para esa "
-"carpeta."
+#: ../mail/evolution-mail.schemas.in.h:189
+msgid "Run junk test on incoming mail."
+msgstr "Ejecutar la prueba de SPAM en el correo entrante."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-#: ../mail/evolution-mail.schemas.in.h:214
-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;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr ""
-"Esta clave deberÃa contener una lista de estructuras XML especificando "
-"cabeceras personalizadas, e indicando si deben mostrarse. El formato de la "
-"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:190
+msgid "Empty Junk folders on exit"
+msgstr "Vaciar las carpetas SPAM al salir"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-#: ../mail/evolution-mail.schemas.in.h:215
-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 "
-"mail sent by known contacts from junk filtering."
-msgstr ""
-"Esta opciÃn està relacionada con la clave lookup_addressbook y se usa para "
-"determinar si se deben buscar direcciones sÃlo en la libreta de direcciones "
-"local para excluir de los filtros de correo basura el correo enviado por "
-"contactos conocidos."
+#: ../mail/evolution-mail.schemas.in.h:191
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Vaciar todas las carpetas SPAM al salir de Evolution."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-#: ../mail/evolution-mail.schemas.in.h:216
-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:192
+msgid "Minimum days between emptying the junk on exit"
+msgstr "DÃas mÃnimos entre el vaciado del SPAM a la salida"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-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:193
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr ""
-"Este ajuste especifica si las conversaciones, de forma predeterminada, "
-"deberÃan estar en estado expandido o contraÃdo. Evolution necesita "
-"reiniciarse para aplicarlo."
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid "Last time Empty Junk was run"
+msgstr "Ãltima vez que se vacià el SPAM"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../mail/evolution-mail.schemas.in.h:195
 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 "
-"restart."
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
-"Este ajuste especifica si las conversaciones se deberÃan ordenar en base al "
-"Ãltimo mensaje de cada conversaciÃn, en lugar de por la fecha del mensaje. "
-"Evolution necesita un reinicio."
+"La Ãltima vez que se vacià el SPAM, en dÃas desde el 1 de enero de 1970 "
+"(Ãpoca)."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder"
-msgstr ""
-"Este valor puede ser una cadena vacÃa, lo que significa que usarà la carpeta "
-"ImÃgenes del sistema, habitualmente ~/ImÃgenes. TambiÃn se usarà esta "
-"carpeta cuando la ruta configurada no apunte a la carpeta existente."
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid "The default plugin for Junk hook"
+msgstr "El complemento predeterminado para SPAM"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-#: ../mail/evolution-mail.schemas.in.h:221
-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
+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 "
+"to the other available plugins."
+msgstr ""
+"Este es el complemento predeterminado para el correo basura, aunque hay "
+"varios complementos activados. Si el complemento predeterminado listado està "
+"desactivado, entonces no usarà los otros complementos disponibles."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Timeout for marking message as seen"
-msgstr "Tiempo para marcar un mensaje como visto"
+#: ../mail/evolution-mail.schemas.in.h:198
+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"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Timeout for marking message as seen."
-msgstr "Tiempo para marcar un mensaje como visto."
+#: ../mail/evolution-mail.schemas.in.h:199
+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 "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"Determina si se debe buscar la direcciÃn del remitente en la libreta de "
+"direcciones. Si se encuentra, no se debe marcar como SPAM. Busca en las "
+"libretas marcadas para autocompletado. Puede ser lento si se han marcado "
+"para autocompletado libretas de direcciones remotas (como LDAP)."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid "UID string of the default account."
-msgstr "Cadena UID para la cuenta predeterminada."
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Determina si se deben buscar direcciones para filtrar SPAM sÃlo en la "
+"libreta de direcciones local"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
-#: ../mail/evolution-mail.schemas.in.h:225
-msgid "Underline color for misspelled words when using inline spelling."
+#: ../mail/evolution-mail.schemas.in.h:201
+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 "
+"mail sent by known contacts from junk filtering."
 msgstr ""
-"Color de subrayado para las palabras mal escritas cuando se use correcciÃn "
-"en lÃnea."
+"Esta opciÃn està relacionada con la clave lookup_addressbook y se usa para "
+"determinar si se deben buscar direcciones sÃlo en la libreta de direcciones "
+"local para excluir de los filtros de correo basura el correo enviado por "
+"contactos conocidos."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
-#: ../mail/evolution-mail.schemas.in.h:226
-msgid "Use custom fonts"
-msgstr "Usar tipografÃa personalizada"
+#: ../mail/evolution-mail.schemas.in.h:202
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+"Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "Use custom fonts for displaying mail."
-msgstr "Usar tipografÃa personalizada para mostrar el correo."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:203
 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 "
-"message or the bottom."
+"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 "
+"checking speed."
 msgstr ""
-"Los usuarios se indignan acerca de dÃnde debe ir el cursor al responder un "
-"mensaje. Esto determina si el cursor se posiciona en la parte superior del "
-"mensaje o en la inferior."
+"Determina si se deben usar cabeceras personalizadas para comprobar si es "
+"SPAM. Si esta opciÃn està activada y las cabeceras se mencionan, se mejorarà "
+"la velocidad de comprobado de correo basura."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:204
+msgid "Custom headers to use while checking for junk."
+msgstr "Cabeceras personalizadas que usar al comprobar si es SPAM."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:205
 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 "
-"the message or the bottom."
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
 msgstr ""
-"Los usuarios se indignan acerca de dÃnde debe ir el la firma al responder un "
-"mensaje. Esto determina si la firma se ubica en la parte superior del "
-"mensaje o en la inferior."
+"Cabeceras personalizadas que usar para comprobar si es SPAM. La lista de "
+"elementos son cadenas con el formato \"headername=valor\"."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid "Variable width font"
-msgstr "TipografÃa de anchura variable"
+#: ../mail/evolution-mail.schemas.in.h:206
+msgid "UID string of the default account."
+msgstr "Cadena UID para la cuenta predeterminada."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-#: ../mail/evolution-mail.schemas.in.h:231
-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
+msgid "Save directory"
+msgstr "Carpeta donde guardar"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-#: ../mail/evolution-mail.schemas.in.h:234
-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
+msgid "Directory for saving mail component files."
+msgstr "Carpeta para guardar archivos enviados por correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
-#: ../mail/evolution-mail.schemas.in.h:235
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-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Â."
+msgid "Composer load/attach directory"
+msgstr "Carpeta de carga/adjuntos del editor"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
-#: ../mail/evolution-mail.schemas.in.h:236
-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"
+msgid "Directory for loading/attaching files to composer."
+msgstr "Carpeta para cargar/adjuntar archivos en el editor."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
-msgid ""
-"Whether to check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-msgstr ""
-"Indica si se debe comprobar si hay mensajes nuevos en todas las cuentas "
-"activas independientemente del conteo en la opciÃn ÂComprobar si hay mensajes "
-"nuevos cada X minutos al iniciar Evolution. Esta opciÃn sÃlo se usa junto "
-"con la opciÃn Âsend_recv_on_startÂ."
+#: ../mail/evolution-mail.schemas.in.h:219
+msgid "Check for new messages on start"
+msgstr "Comprobar si hay mensajes nuevos al inicio"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
@@ -9747,32 +9745,34 @@ msgstr ""
 "Incluye tambiÃn el envÃo de mensajes en la bandeja de salida."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-#: ../mail/evolution-mail.schemas.in.h:237
-msgid ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when there was used any 'Forward to' filter action and approximately "
-"one minute after the last action invocation."
-msgstr ""
-"Indica si se debe limpiar la bandeja de salida despuÃs de finalizar el "
-"filtrado. La limpieza de la bandeja de salida sÃlo sucede cuando se usà "
-"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:221
+msgid "Check for new messages in all active accounts"
+msgstr "Comprobar si hay mensajes nuevos en todas las cuentas activas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
-msgid "Whether to show local folders (On This Computer) in a folder tree"
+msgid ""
+"Whether to check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
-"Indica si se deben mostrar las carpetas locales (En este equipo) en un Ãrbol "
-"de carpetas"
+"Indica si se debe comprobar si hay mensajes nuevos en todas las cuentas "
+"activas independientemente del conteo en la opciÃn ÂComprobar si hay mensajes "
+"nuevos cada X minutos al iniciar Evolution. Esta opciÃn sÃlo se usa junto "
+"con la opciÃn Âsend_recv_on_startÂ."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 #: ../mail/evolution-mail.schemas.in.h:239
-msgid "Width of the message-list pane"
-msgstr "Anchura del panel de lista de mensajes"
+msgid "Server synchronization interval"
+msgstr "Intervalo de sincronizaciÃn con el servidor"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 #: ../mail/evolution-mail.schemas.in.h:240
-msgid "Width of the message-list pane."
-msgstr "Anchura del panel de lista de mensajes."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+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."
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
@@ -9802,49 +9802,49 @@ msgstr ""
 "automÃticamente"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Address book to use for storing automatically synced contacts from GAIM"
-msgstr ""
-"Lista de direcciones que usar para almacenar automÃticamente los contactos "
-"sincronicados de GAIM"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
 msgid "Auto sync GAIM contacts"
 msgstr "Auto sincronizar contactos de GAIM"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
-msgid "Check interval for GAIM syncing of contacts"
-msgstr "Intervalo de comprobaciÃn para sincronizar contactos de GAIM"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
+msgid "Whether GAIM contacts should be automaticall synced"
+msgstr "Indica si los contactos de GAIM se deben sincronizar automÃticamente"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
 msgid "Enable autocontacts"
 msgstr "Activar contactos automÃticos"
 
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+msgid ""
+"Whether contacts should be automatically added to the user's addressbook"
+msgstr ""
+"indica si los contactos se deben aÃadir automÃticamente a la libre de "
+"direcciones del usuario"
+
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
 msgid "GAIM address book source"
 msgstr "Libreta de direcciones fuente de GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid "GAIM check interval"
-msgstr "Intervalo de comprobaciÃn para GAIM"
+msgid "Address book to use for storing automatically synced contacts from GAIM"
+msgstr ""
+"Lista de direcciones que usar para almacenar automÃticamente los contactos "
+"sincronicados de GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "GAIM last sync MD5"
-msgstr "MD5 de la Ãltima sincronizaciÃn de Gaim"
+msgid "GAIM check interval"
+msgstr "Intervalo de comprobaciÃn para GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "GAIM last sync time"
-msgstr "Hora de la Ãltima sincronizaciÃn de Gaim"
+msgid "Check interval for GAIM syncing of contacts"
+msgstr "Intervalo de comprobaciÃn para sincronizar contactos de GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "Whether GAIM contacts should be automaticall synced"
-msgstr "Indica si los contactos de GAIM se deben sincronizar automÃticamente"
+msgid "GAIM last sync MD5"
+msgstr "MD5 de la Ãltima sincronizaciÃn de Gaim"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid ""
-"Whether contacts should be automatically added to the user's addressbook"
-msgstr ""
-"indica si los contactos se deben aÃadir automÃticamente a la libre de "
-"direcciones del usuario"
+msgid "GAIM last sync time"
+msgstr "Hora de la Ãltima sincronizaciÃn de Gaim"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
@@ -9864,25 +9864,25 @@ msgstr ""
 "los valores separados por Â;Â."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-msgid "Automatically launch editor when key is pressed in the mail composer."
-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:1
+msgid "Default External Editor"
+msgstr "Editor externo predeterminado"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:125
-msgid "Automatically launch when a new mail is edited"
-msgstr "Lanzar automÃticamente al editar un correo nuevo"
+msgid "The default command that must be used as the editor."
+msgstr "El comando predeterminado que usar como editor."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
-msgid "Default External Editor"
-msgstr "Editor externo predeterminado"
+#: ../plugins/external-editor/external-editor.c:125
+msgid "Automatically launch when a new mail is edited"
+msgstr "Lanzar automÃticamente al editar un correo nuevo"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "The default command that must be used as the editor."
-msgstr "El comando predeterminado que usar como editor."
+msgid "Automatically launch editor when key is pressed in the mail composer."
+msgstr ""
+"Lanzar el editor automÃticamente al pulsar una tecla en el editor de correos."
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
@@ -9909,98 +9909,98 @@ msgstr "indica si se deben eliminar los objetos iTip procesados"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Beep or play sound file."
-msgstr "Pitar o reproducir un archivo de sonido."
+msgid "Notify new messages for Inbox only."
+msgstr "Notificar nuevos correos sÃlo para la bandeja de entrada."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "Activar los mensajes D-Bus."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+"Indica si se deben notificar sÃlo los mensajes en la carpeta bandeja de "
+"entrada."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable icon in notification area."
-msgstr "Activar el icono en el Ãrea de notificaciÃn."
+msgid "Enable D-Bus messages."
+msgstr "Activar los mensajes D-Bus."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
-msgid "FIXME"
-msgstr "ARREGLAR"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Genera un mensaje D-BUS cuando llega un mensaje de correo nuevo."
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
+msgid "Enable icon in notification area."
+msgstr "Activar el icono en el Ãrea de notificaciÃn."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
-"Si està activado pitarÃ, de otra manera reproducirà un archivo de sonido "
-"cuando lleguen mensajes nuevos."
+"Mostrar el icono de correo nuevo en el Ãrea de notificaciÃn cuando llegan "
+"nuevos mensajes."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Notify new messages for Inbox only."
-msgstr "Notificar nuevos correos sÃlo para la bandeja de entrada."
+msgid "Popup message together with the icon."
+msgstr "Mensaje emergente junto con el icono."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+"Indica si se debe mostrar un mensaje sobre el icono cuando llega un mensaje "
+"nuevo."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "Reproducir un sonido cuando llegue correo nuevo."
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgid "Whether play sound or beep when new messages arrive."
 msgstr ""
-"Reproducir el tema de sonido cuando llega un correo nuevo, si no se està en "
-"el modo pitido."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-msgid "Popup message together with the icon."
-msgstr "Mensaje emergente junto con el icono."
+"Indica si se debe reproducir un sonido o pitar cuando llega un mensaje nuevo."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-"Mostrar el icono de correo nuevo en el Ãrea de notificaciÃn cuando llegan "
-"nuevos mensajes."
+msgid "Beep or play sound file."
+msgstr "Pitar o reproducir un archivo de sonido."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid "Sound file name to be played."
-msgstr "Nombre del archivo de sonido que reproducir."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"Si està activado pitarÃ, de otra manera reproducirà un archivo de sonido "
+"cuando lleguen mensajes nuevos."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Sound file name to be played."
+msgstr "Nombre del archivo de sonido que reproducir."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Archivo que reproducir cuando llega un mensaje nuevo, si no se debe "
 "reproducir un pitido."
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Use sound theme"
-msgstr "Usar un tema de sonido"
-
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
-msgid "Whether play sound or beep when new messages arrive."
-msgstr ""
-"Indica si se debe reproducir un sonido o pitar cuando llega un mensaje nuevo."
+msgid "FIXME"
+msgstr "ARREGLAR"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-"Indica si se debe mostrar un mensaje sobre el icono cuando llega un mensaje "
-"nuevo."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Use sound theme"
+msgstr "Usar un tema de sonido"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
-msgid "Whether to notify new messages in Inbox folder only."
+msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
-"Indica si se deben notificar sÃlo los mensajes en la carpeta bandeja de "
-"entrada."
+"Reproducir el tema de sonido cuando llega un correo nuevo, si no se està en "
+"el modo pitido."
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
 msgid "Mode to use when displaying mails"
@@ -10031,86 +10031,91 @@ msgstr ""
 "plantillas sustituya en el cuerpo del mensaje."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Default sidebar width"
-msgstr "Anchura predeterminada de la barra lateral"
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Skip development warning dialog"
+msgstr "Saltar el diÃlogo de advertencia de desarrollo"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-msgid "Enable express mode"
-msgstr "Activar modo exprÃs"
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Indica si se omite el diÃlogo de advertencia en las versiones de desarrollo "
+"de Evolution."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Flag that enables a much simplified user interface."
-msgstr "OpciÃn que activa una interfaz mucho mÃs simple."
+#: ../shell/apps_evolution_shell.schemas.in.h:7
+msgid "Initial attachment view"
+msgstr "Vista inicial de adjunto"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "Id o alias del componente que se mostrarà al iniciar."
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+"Vista inicial para los widgets de la barra de adjuntos. Â0Â es para Vista de "
+"icono, Â1Â es para Vista de lista."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "Initial attachment view"
-msgstr "Vista inicial de adjunto"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
 msgid "Initial file chooser folder"
 msgstr "Carpeta inicial del selector de archivos"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr ""
 "La carpeta inicial para los diÃlogos GtkFileChooser (selector de archivos)."
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:316
+msgid "Start in offline mode"
+msgstr "Iniciar en modo desconectado"
+
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
-"Vista inicial para los widgets de la barra de adjuntos. Â0Â es para Vista de "
-"icono, Â1Â es para Vista de lista."
+"Indica si Evolution se iniciarà en modo desconectado en vez de en modo "
+"conectado."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Offline folder paths"
+msgstr "Rutas a las carpetas desconectadas"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage."
 msgstr ""
 "Lista de rutas a las carpetas que se sincronizarÃn al disco para usar "
 "desconectado."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
-msgid "Offline folder paths"
-msgstr "Rutas a las carpetas desconectadas"
-
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-msgid "Sidebar is visible"
-msgstr "La barra lateral es visible"
+#: ../shell/apps_evolution_shell.schemas.in.h:61
+msgid "Enable express mode"
+msgstr "Activar modo exprÃs"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-#: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid "Skip development warning dialog"
-msgstr "Saltar el diÃlogo de advertencia de desarrollo"
+#: ../shell/apps_evolution_shell.schemas.in.h:62
+msgid "Flag that enables a much simplified user interface."
+msgstr "OpciÃn que activa una interfaz mucho mÃs simple."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:316
-msgid "Start in offline mode"
-msgstr "Iniciar en modo desconectado"
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Window buttons are visible"
+msgstr "Los botones de la ventana son visibles"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-#: ../shell/apps_evolution_shell.schemas.in.h:34
-msgid "Statusbar is visible"
-msgstr "La barra de estado es visible"
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Whether the window buttons should be visible."
+msgstr "Indica si la los botones de la ventana deben ser visibles."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The default width for the sidebar, in pixels."
-msgstr "La anchura predeterminada para la barra lateral, en pÃxeles."
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Window button style"
+msgstr "Estilo de los botones de ventana"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -10121,89 +10126,84 @@ msgstr ""
 "determina por la configuraciÃn de la barra de herramientas de GNOME."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Toolbar is visible"
 msgstr "La barra de herramientas es visible"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Indica si Evolution se iniciarà en modo desconectado en vez de en modo "
-"conectado."
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Whether the toolbar should be visible."
+msgstr "Indica si la barra de herramientas debe ser visible."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether the sidebar should be visible."
-msgstr "Indica si la barra lateral debe ser visible."
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Sidebar is visible"
+msgstr "La barra lateral es visible"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-#: ../shell/apps_evolution_shell.schemas.in.h:57
-msgid "Whether the status bar should be visible."
-msgstr "Indica si la barra de estado debe ser visible."
+#: ../shell/apps_evolution_shell.schemas.in.h:29
+msgid "Whether the sidebar should be visible."
+msgstr "Indica si la barra lateral debe ser visible."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-#: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid "Whether the toolbar should be visible."
-msgstr "Indica si la barra de herramientas debe ser visible."
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Statusbar is visible"
+msgstr "La barra de estado es visible"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Indica si se omite el diÃlogo de advertencia en las versiones de desarrollo "
-"de Evolution."
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid "Whether the status bar should be visible."
+msgstr "Indica si la barra de estado debe ser visible."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "Whether the window buttons should be visible."
-msgstr "Indica si la los botones de la ventana deben ser visibles."
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Id o alias del componente que se mostrarà al iniciar."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid "Window button style"
-msgstr "Estilo de los botones de ventana"
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "Default sidebar width"
+msgstr "Anchura predeterminada de la barra lateral"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-#: ../shell/apps_evolution_shell.schemas.in.h:62
-msgid "Window buttons are visible"
-msgstr "Los botones de la ventana son visibles"
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The default width for the sidebar, in pixels."
+msgstr "La anchura predeterminada para la barra lateral, en pÃxeles."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-msgid "Socket path for SpamAssassin"
-msgstr "Ruta del zÃcalo para SpamAssassin"
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use only local spam tests."
+msgstr "Usar sÃlo comprobaciones de SPAM locales."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-msgid "SpamAssassin client binary"
-msgstr "Cliente de SpamAssasin"
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Usa sÃlo comprobaciones de SPAM locales (sin DNS)."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-msgid "SpamAssassin daemon binary"
-msgstr "Demonio de SpamAssassin"
+msgid "Socket path for SpamAssassin"
+msgstr "Ruta del zÃcalo para SpamAssassin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar el demonio y cliente de SpamAssassin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usar el demonio y cliente de SpamAssassin (spamc/spamd)."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
-msgid "Use only local spam tests."
-msgstr "Usar sÃlo comprobaciones de SPAM locales."
+msgid "SpamAssassin client binary"
+msgstr "Cliente de SpamAssasin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
-msgid "Use only the local spam tests (no DNS)."
-msgstr "Usa sÃlo comprobaciones de SPAM locales (sin DNS)."
+msgid "SpamAssassin daemon binary"
+msgstr "Demonio de SpamAssassin"
 
 #: ../em-format/em-format.c:1060 ../em-format/em-format-quote.c:318
-#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:7
+#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
 #: ../modules/mail/em-mailer-prefs.c:70
 msgid "From"
 msgstr "De"
@@ -10227,12 +10227,12 @@ msgstr "Cco"
 
 #: ../em-format/em-format.c:1065 ../em-format/em-format-quote.c:463
 #: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:75
 #: ../smime/lib/e-cert.c:1147
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:2
+#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
@@ -10243,7 +10243,7 @@ msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
 #: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:78
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Cara"
 
@@ -10510,9 +10510,9 @@ msgstr "Escribiendo Â%sÂ"
 msgid "Writing \"%s\" to %s"
 msgstr "Escribiendo Â%s a Â%sÂ"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:9
 #: ../plugins/google-account-setup/google-contacts-source.c:388
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
 msgid "weeks"
 msgstr "semanas"
 
@@ -10533,28 +10533,28 @@ msgstr ""
 "error."
 
 #: ../e-util/e-system.error.xml.h:1
-msgid "Because \"{1}\"."
-msgstr "Porque Â{1}Â."
+msgid "File exists \"{0}\"."
+msgstr "El archivo existe Â{0}Â."
 
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file \"{0}\"."
-msgstr "No se puede abrir el archivo Â{0}Â."
+msgid "Do you wish to overwrite it?"
+msgstr "ÂQuiere sobreescribirlo?"
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file \"{0}\"."
-msgstr "No se puede guardar el archivo Â{0}Â."
+#: ../e-util/e-system.error.xml.h:3 ../mail/mail.error.xml.h:113
+msgid "_Overwrite"
+msgstr "_Sobreescribir"
 
 #: ../e-util/e-system.error.xml.h:4
-msgid "Do you wish to overwrite it?"
-msgstr "ÂQuiere sobreescribirlo?"
+msgid "Cannot save file \"{0}\"."
+msgstr "No se puede guardar el archivo Â{0}Â."
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists \"{0}\"."
-msgstr "El archivo existe Â{0}Â."
+msgid "Because \"{1}\"."
+msgstr "Porque Â{1}Â."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
-msgid "_Overwrite"
-msgstr "_Sobreescribir"
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "No se puede abrir el archivo Â{0}Â."
 
 #: ../e-util/e-util.c:245
 msgid "Could not open the link."
@@ -10739,7 +10739,7 @@ msgstr "I_ncluir conversaciones:"
 msgid "A_dd Condition"
 msgstr "AÃadir a_cciÃn"
 
-#: ../filter/e-filter-rule.c:1146 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:1146 ../filter/filter.ui.h:1
 #: ../mail/em-utils.c:306
 msgid "Incoming"
 msgstr "Entrante"
@@ -10757,117 +10757,117 @@ msgid "Edit Rule"
 msgstr "Editar regla"
 
 #: ../filter/filter.error.xml.h:1
-msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "Error en la expresiÃn regular Â{0}Â."
+msgid "Missing date."
+msgstr "Falta la fecha."
 
 #: ../filter/filter.error.xml.h:2
-msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "No es posible compilar la expresiÃn regular Â{1}Â."
+msgid "You must choose a date."
+msgstr "Debe elegir una fecha."
 
 #: ../filter/filter.error.xml.h:3
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "El archivo Â{0}Â no existe o no es un archivo regular."
+msgid "Missing file name."
+msgstr "Falta el nombre de archivo."
 
 #: ../filter/filter.error.xml.h:4
-msgid "Missing date."
-msgstr "Falta la fecha."
+msgid "You must specify a file name."
+msgstr "Debe especificar un nombre de archivo."
 
 #: ../filter/filter.error.xml.h:5
-msgid "Missing file name."
-msgstr "Falta el nombre de archivo."
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "El archivo Â{0}Â no existe o no es un archivo regular."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
-msgid "Missing name."
-msgstr "Falta el nombre."
+#: ../filter/filter.error.xml.h:6
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "Error en la expresiÃn regular Â{0}Â."
 
 #: ../filter/filter.error.xml.h:7
-msgid "Name &quot;{0}&quot; already used."
-msgstr "El nombre Â{0} ya se està usando."
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "No es posible compilar la expresiÃn regular Â{1}Â."
 
-#: ../filter/filter.error.xml.h:8
-msgid "Please choose another name."
-msgstr "Elija otro nombre."
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+msgid "Missing name."
+msgstr "Falta el nombre."
 
 #: ../filter/filter.error.xml.h:9
-msgid "You must choose a date."
-msgstr "Debe elegir una fecha."
-
-#: ../filter/filter.error.xml.h:10
 msgid "You must name this filter."
 msgstr "Debe dar un nombre a este filtro."
 
+#: ../filter/filter.error.xml.h:10
+msgid "Name &quot;{0}&quot; already used."
+msgstr "El nombre Â{0} ya se està usando."
+
 #: ../filter/filter.error.xml.h:11
-msgid "You must specify a file name."
-msgstr "Debe especificar un nombre de archivo."
+msgid "Please choose another name."
+msgstr "Elija otro nombre."
 
-#: ../filter/filter.ui.h:1
-msgid "Compare against"
-msgstr "Comparar con"
+#: ../filter/filter.ui.h:2
+msgid "the current time"
+msgstr "la hora actual"
 
 #: ../filter/filter.ui.h:3
-msgid "Show filters for mail:"
-msgstr "Mostrar filtros para el correo:"
+msgid "the time you specify"
+msgstr "la fecha que especifique"
 
 #: ../filter/filter.ui.h:4
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"La fecha del mensaje se compararà con las\n"
-"00:00 de la fecha aquà especificada."
+msgid "a time relative to the current time"
+msgstr "una fecha relativa al momento actual"
 
-#: ../filter/filter.ui.h:6
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"La fecha del mensaje se compararà con una\n"
-"fecha relativa al momento del filtrado."
+#: ../filter/filter.ui.h:5
+msgid "seconds"
+msgstr "segundos"
 
-#: ../filter/filter.ui.h:8
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"La fecha del mensaje se compararà con la\n"
-"fecha actual del momento del filtrado."
+#: ../filter/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "meses"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:163
-msgid "_Filter Rules"
-msgstr "Reglas de _filtrado"
+#: ../filter/filter.ui.h:11
+msgid "years"
+msgstr "aÃos"
 
 #: ../filter/filter.ui.h:12
-msgid "a time relative to the current time"
-msgstr "una fecha relativa al momento actual"
-
-#: ../filter/filter.ui.h:13
 msgid "ago"
 msgstr "atrÃs"
 
-#: ../filter/filter.ui.h:16
+#: ../filter/filter.ui.h:13
 msgid "in the future"
 msgstr "en el futuro"
 
-#: ../filter/filter.ui.h:18
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-msgid "months"
-msgstr "meses"
+#: ../filter/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Mostrar filtros para el correo:"
 
-#: ../filter/filter.ui.h:19
-msgid "seconds"
-msgstr "segundos"
+#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:163
+msgid "_Filter Rules"
+msgstr "Reglas de _filtrado"
 
-#: ../filter/filter.ui.h:20
-msgid "the current time"
-msgstr "la hora actual"
+#: ../filter/filter.ui.h:17
+msgid "Compare against"
+msgstr "Comparar con"
 
-#: ../filter/filter.ui.h:21
-msgid "the time you specify"
-msgstr "la fecha que especifique"
+#: ../filter/filter.ui.h:18
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"La fecha del mensaje se compararà con la\n"
+"fecha actual del momento del filtrado."
 
-#: ../filter/filter.ui.h:23
-msgid "years"
-msgstr "aÃos"
+#: ../filter/filter.ui.h:20
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"La fecha del mensaje se compararà con las\n"
+"00:00 de la fecha aquà especificada."
+
+#: ../filter/filter.ui.h:22
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"La fecha del mensaje se compararà con una\n"
+"fecha relativa al momento del filtrado."
 
 #: ../libemail-engine/e-mail-folder-utils.c:109
 #, c-format
@@ -10914,12 +10914,12 @@ msgid_plural "Saving %d messages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:624
+#: ../libemail-engine/e-mail-folder-utils.c:1535 ../mail/em-folder-utils.c:624
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "URI  %s de la carpeta no vÃlida"
 
-#: ../libemail-engine/e-mail-session.c:106 ../mail/em-folder-properties.c:310
+#: ../libemail-engine/e-mail-session.c:106 ../mail/em-folder-properties.c:330
 #: ../mail/em-folder-tree-model.c:714
 #: ../modules/mail/e-mail-shell-view-private.c:1095
 #: ../modules/mail/e-mail-shell-view-private.c:1106
@@ -10947,7 +10947,7 @@ msgstr "Correo enviado"
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:710
 #: ../modules/mail/e-mail-shell-view-private.c:1101
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1037 ../plugins/templates/templates.c:1337
 #: ../plugins/templates/templates.c:1347
 msgid "Templates"
@@ -11178,7 +11178,7 @@ msgstr "Nombre de la cuenta"
 #. we changed user, thus reset the chosen calendar combo too, because
 #. * other user means other calendars subscribed
 #: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3418
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:51
 #: ../plugins/google-account-setup/google-source.c:316
 #: ../plugins/google-account-setup/google-source.c:558
 #: ../plugins/google-account-setup/google-source.c:695
@@ -11186,8 +11186,8 @@ msgid "Default"
 msgstr "Predeterminado"
 
 #: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/em-format-html-display.c:1395 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:172
+#: ../mail/em-format-html-display.c:1395 ../mail/mail-config.ui.h:58
+#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:172
 #: ../widgets/misc/e-attachment-paned.c:177
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -11696,7 +11696,7 @@ msgstr "Quitar correos _duplicados"
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar los mensajes seleccionados para buscar duplicados"
 
-#: ../mail/e-mail-reader.c:2117 ../mail/mail.error.xml.h:107
+#: ../mail/e-mail-reader.c:2117 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1510
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
@@ -11706,7 +11706,7 @@ msgstr "Responder a _todos"
 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:2124 ../mail/mail.error.xml.h:108
+#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
@@ -11917,7 +11917,7 @@ msgstr "Siguiente"
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3731 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3731 ../mail/mail-dialogs.ui.h:20
 msgid "Reply"
 msgstr "Responder"
 
@@ -11978,8 +11978,8 @@ msgctxt "mail-signature"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../mail/em-account-editor.c:1738 ../mail/em-account-editor.c:4772
-#: ../mail/em-account-editor.c:4807
+#: ../mail/em-account-editor.c:1738 ../mail/em-account-editor.c:4773
+#: ../mail/em-account-editor.c:4808
 msgid "Never"
 msgstr "Nunca"
 
@@ -11991,7 +11991,7 @@ msgstr "Siempre"
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaje"
 
-#: ../mail/em-account-editor.c:2881 ../mail/mail-config.ui.h:169
+#: ../mail/em-account-editor.c:2881 ../mail/mail-config.ui.h:164
 msgid "_Path:"
 msgstr "R_uta:"
 
@@ -12031,7 +12031,7 @@ msgstr "RecepciÃn de correo"
 msgid "Please configure the following account settings."
 msgstr "Configure las siguientes opciones de la cuenta."
 
-#: ../mail/em-account-editor.c:2930 ../mail/em-account-editor.c:3722
+#: ../mail/em-account-editor.c:2930 ../mail/em-account-editor.c:3723
 msgid "Sending Email"
 msgstr "EnvÃo de correo"
 
@@ -12072,49 +12072,49 @@ msgstr ""
 "\n"
 "Pulse ÂAplicar para guardar su configuraciÃn."
 
-#: ../mail/em-account-editor.c:3484
+#: ../mail/em-account-editor.c:3485
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay mensajes _nuevos cada"
 
-#: ../mail/em-account-editor.c:3492
+#: ../mail/em-account-editor.c:3493
 msgid "minu_tes"
 msgstr "minuto_s"
 
-#: ../mail/em-account-editor.c:4185 ../mail/mail-config.ui.h:109
+#: ../mail/em-account-editor.c:4186 ../mail/mail-config.ui.h:166
 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:4240 ../mail/em-account-editor.c:4342
+#: ../mail/em-account-editor.c:4241 ../mail/em-account-editor.c:4343
 msgid "Receiving Options"
 msgstr "Opciones de recepciÃn"
 
-#: ../mail/em-account-editor.c:4241 ../mail/em-account-editor.c:4343
+#: ../mail/em-account-editor.c:4242 ../mail/em-account-editor.c:4344
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
-#: ../mail/em-account-editor.c:4766 ../mail/em-account-editor.c:4801
+#: ../mail/em-account-editor.c:4767 ../mail/em-account-editor.c:4802
 msgid "Always (SSL)"
 msgstr "Siempre (SSL)"
 
-#: ../mail/em-account-editor.c:4769 ../mail/em-account-editor.c:4804
+#: ../mail/em-account-editor.c:4770 ../mail/em-account-editor.c:4805
 msgid "When possible (TLS)"
 msgstr "Cuando sea posible (TLS)"
 
-#: ../mail/em-account-editor.c:4846
+#: ../mail/em-account-editor.c:4847
 msgid "Setup Google con_tacts with Evolution"
 msgstr "Configurar los con_tactos de Google con Evolution"
 
-#: ../mail/em-account-editor.c:4853
+#: ../mail/em-account-editor.c:4854
 msgid "Setup Google ca_lendar with Evolution"
 msgstr "Configurar el ca_lendario de Google con Evolution"
 
-#: ../mail/em-account-editor.c:4901
+#: ../mail/em-account-editor.c:4902
 msgid "Setup _Yahoo calendar with Evolution"
 msgstr "Configurar el calendario de _Yahoo con Evolution"
 
-#: ../mail/em-account-editor.c:4926
+#: ../mail/em-account-editor.c:4927
 msgid "Yahoo Calen_dar name:"
 msgstr "Nombre del calen_dario de Yahoo:"
 
@@ -12263,7 +12263,7 @@ msgstr "no està configurado"
 msgid "is set"
 msgstr "està configurado"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:67
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:114
 msgid "Junk"
 msgstr "SPAM"
 
@@ -12312,11 +12312,11 @@ 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:16
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:19
 msgid "Read"
 msgstr "LeÃdo"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "Destinatarios"
 
@@ -12344,11 +12344,11 @@ msgstr "devuelve menor que"
 msgid "Run Program"
 msgstr "Ejecutar programa"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "PuntuaciÃn"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:15
 msgid "Sender"
 msgstr "Remitente"
 
@@ -12389,6 +12389,11 @@ msgid "Stop Processing"
 msgstr "Parar de procesar"
 
 #: ../mail/em-filter-i18n.h:75
+#| msgid "Unselected Column"
+msgid "Unset Color"
+msgstr "Color no establecido"
+
+#: ../mail/em-filter-i18n.h:76
 msgid "Unset Status"
 msgstr "Quitar estado"
 
@@ -12401,29 +12406,29 @@ msgstr "Luego"
 msgid "Add Ac_tion"
 msgstr "AÃadir a_cciÃn"
 
-#: ../mail/em-folder-properties.c:144
+#: ../mail/em-folder-properties.c:145
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensajes no leÃdo:"
 msgstr[1] "Mensajes no leÃdos:"
 
-#: ../mail/em-folder-properties.c:155
+#: ../mail/em-folder-properties.c:156
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Mensajes en total:"
 msgstr[1] "Mensajes en total:"
 
-#: ../mail/em-folder-properties.c:176
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Uso de cuota (%s):"
 
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:179
 #, c-format
 msgid "Quota usage"
 msgstr "Uso de cuota"
 
-#: ../mail/em-folder-properties.c:315
+#: ../mail/em-folder-properties.c:335
 msgid "Folder Properties"
 msgstr "Propiedades de la carpeta"
 
@@ -12463,12 +12468,12 @@ msgstr "Moviendo la carpeta %s"
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:2103 ../mail/message-list.c:2301
+#: ../mail/em-folder-tree.c:2103 ../mail/message-list.c:2304
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2306
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
@@ -12678,7 +12683,7 @@ msgstr ""
 "difÃcil que un espÃa vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../mail/em-format-html-display.c:253 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:253 ../smime/gui/smime-ui.ui.h:43
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
@@ -12852,101 +12857,90 @@ msgstr "Carpetas de _bÃsqueda"
 msgid "Add Folder"
 msgstr "AÃadir carpeta"
 
-#: ../mail/evolution-mail.schemas.in.h:1
-msgid "\"Filter Editor\" window height"
-msgstr "Altura de la ventana ÂEditor de filtrosÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:2
-msgid "\"Filter Editor\" window maximize state"
-msgstr "Estado maximizado de la ventana ÂEditor de filtrosÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:3
-msgid "\"Filter Editor\" window width"
-msgstr "Anchura de la ventana ÂEditor de filtrosÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:4
-msgid "\"Folder Subscriptions\" window height"
-msgstr "Altura de la ventana ÂSuscripciones de carpetasÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:5
-msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "Estado maximizado de la ventana ÂSuscripciones de carpetasÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "\"Folder Subscriptions\" window width"
-msgstr "Anchura de la ventana ÂSuscripciones de carpetasÂ"
-
-#: ../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:8
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "Estado maximizado de la ventana ÂEditor de filtrosÂ"
-
-#: ../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:10
-msgid "\"Send and Receive Mail\" window height"
-msgstr "Altura de la ventana ÂEnviar y recibir correoÂ"
-
 #: ../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Â"
+msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
+msgstr ""
+"Firmar mensajes digitalmente cuando el mensaje original esteÌ firmado (PGP o "
+"S/MIME)"
 
-#: ../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:39
+msgid "Composer Window default width"
+msgstr "Anchura predeterminada de la ventana de redacciÃn de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Attribute message."
-msgstr "Atribuir mensaje."
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Default width of the Composer Window."
+msgstr "Anchura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Composer Window default height"
 msgstr "Altura predeterminada de la ventana de redacciÃn de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer Window default width"
-msgstr "Anchura predeterminada de la ventana de redacciÃn de mensajes"
-
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default height of the mail browser window."
-msgstr "Altura predeterminada de la ventana del examinador de correo."
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Attribute message."
+msgstr "Atribuir mensaje."
+
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr ""
+"El texto insertado al responder a un mensaje, atribuyendo el mensaje a su "
+"autor original."
+
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid "Forward message."
+msgstr "Reenviar mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:39
-msgid "Default maximized state of the mail browser window."
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
 msgstr ""
-"Anchura predeterminada en estado maximizado de la ventana del examinador de "
-"correo."
+"El texto insertado al reenviar un mensaje, diciendo que el a continuaciÃn "
+"està el mensaje reenviado."
 
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Default reply style"
-msgstr "Estilo de respuesta predeterminado"
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Original message."
+msgstr "Mensaje original."
 
-#: ../mail/evolution-mail.schemas.in.h:42
-msgid "Default width of the Composer Window."
-msgstr "Anchura predeterminada de la ventana del editor de mensajes."
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr ""
+"El texto insertado al responder a un mensaje (publicando por encima), "
+"atribuyendo el mensaje a su autor original."
 
-#: ../mail/evolution-mail.schemas.in.h:43
-msgid "Default width of the mail browser window."
-msgstr "Anchura predeterminada de la ventana del examinador de correo."
+#: ../mail/evolution-mail.schemas.in.h:52
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
+msgstr ""
+"Este valor puede ser una cadena vacÃa, lo que significa que usarà la carpeta "
+"ImÃgenes del sistema, habitualmente ~/ImÃgenes. TambiÃn se usarà esta "
+"carpeta cuando la ruta configurada no apunte a la carpeta existente."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgstr ""
+"Indica si se deben mostrar las carpetas locales (En este equipo) en un Ãrbol "
+"de carpetas."
+
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
-"Define the email export format when doing drag'n'drop. Possible values are : "
-"mbox or pdf"
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Requires a restart to apply."
 msgstr ""
-"Definir el formato de exportaciÃn de correo-e al arrastrar y soltar. Los "
-"valores posibles son Âmbox o ÂpdfÂ"
+"Este ajuste especifica si las conversaciones, de forma predeterminada, "
+"deberÃan estar en estado expandido o contraÃdo. Evolution necesita "
+"reiniciarse para aplicarlo."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
@@ -12954,42 +12948,49 @@ msgstr ""
 "Describe si las cabeceras del mensajes en la vista con paneles se deben "
 "contraer o expandir de manera predeterminada. Â0Â = expandidas Â1Â = contraÃdas"
 
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user."
 msgstr ""
-"Firmar mensajes digitalmente cuando el mensaje original esteÌ firmado (PGP o "
-"S/MIME)"
+"Indica cÃmo ordenar cuentas en un Ãrbol de carpetas usado en una vista de "
+"Correo. Cuando està establecido a cierto las cuentas se ordenan "
+"alfabÃticamente, con la excepciÃn de En este equipo y Carpetas de bÃsqueda, "
+"de lo contrario las carpetas se ordenan por el orden dado por el usuario."
 
-#: ../mail/evolution-mail.schemas.in.h:57
-msgid "Drag'n'drop export format"
-msgstr "Formato de exportaciÃn al arrastrar y soltar"
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Mail browser width"
+msgstr "Anchura del examinador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:79
-msgid ""
-"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
-"(: email sent date), 2 (: drag'n'drop date)"
-msgstr ""
-"El nombre del archivo exportado serÃ: AAAmmDDHHMMSS_titulo_correo-e. Los "
-"valores posibles son: Â1Â (fecha de envÃo del correo-e) y Â2Â(fecha de "
-"arrastrar y soltar)"
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Default width of the mail browser window."
+msgstr "Anchura predeterminada de la ventana del examinador de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid "Format of the drag'n'drop export filename"
-msgstr "Formato del nombre del archivo al exportar arrastrando y soltando"
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Mail browser height"
+msgstr "Altura del examinador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:82
-msgid "Forward message."
-msgstr "Reenviar mensaje."
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "Default height of the mail browser window."
+msgstr "Altura predeterminada de la ventana del examinador de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:90
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Mail browser maximized"
+msgstr "Examinador de correo maximizado"
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Default maximized state of the mail browser window."
 msgstr ""
-"Altura inicial de la ventana ÂEditor de filtrosÂ. El valor se actualiza segÃn "
-"el usuario redimensiona verticalmente la ventana."
+"Anchura predeterminada en estado maximizado de la ventana del examinador de "
+"correo."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "\"Folder Subscriptions\" window height"
+msgstr "Altura de la ventana ÂSuscripciones de carpetasÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -12997,35 +12998,11 @@ msgstr ""
 "Altura inicial de la ventana ÂSuscripciones de carpetasÂ. El valor se "
 "actualiza segÃn el usuario redimensiona verticalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-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:93
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-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:94
-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."
-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:138
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "Estado maximizado de la ventana ÂSuscripciones de carpetasÂ"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13038,42 +13015,11 @@ msgstr ""
 "no se puede maximizar. Esta clave existe sÃlo como un detalle de "
 "implementaciÃn."
 
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"Estado inicial maximizado de la ventana ÂEditor de carpetas de bÃsquedaÂ. 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 "
-"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:97
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"Estado inicial maximizado de la ventana ÂEnviar y recibir correoÂ. El valor "
-"se actualiza cuando el usuario maximiza o reduce la ventana. Nota: Evolution "
-"no usa este valor en particular ya que la ventana ÂEnviar y recibir correo "
-"no se puede maximizar. Esta clave existe sÃlo como un detalle de "
-"implementaciÃn."
-
-#: ../mail/evolution-mail.schemas.in.h:98
-msgid ""
-"Initial width of the \"Filter Editor\" 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:140
+msgid "\"Folder Subscriptions\" window width"
+msgstr "Anchura de la ventana ÂSuscripciones de carpetasÂ"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13081,31 +13027,24 @@ msgstr ""
 "Anchura inicial de la ventana ÂSuscripciones de carpetasÂ. El valor se "
 "actualiza segÃn el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:100
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-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:149
+msgid "Default reply style"
+msgstr "Estilo de respuesta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
 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:114
-msgid "List of accepted licenses"
-msgstr "Lista de licencias aceptadas"
+"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:115
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13114,114 +13053,180 @@ msgstr ""
 "lista contiene cadenas nombrando subcarpetas relativas a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:209
+msgid "List of accepted licenses"
+msgstr "Lista de licencias aceptadas"
+
+#: ../mail/evolution-mail.schemas.in.h:210
 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:127
-msgid "Mail browser height"
-msgstr "Altura del examinador de correo"
+#: ../mail/evolution-mail.schemas.in.h:213
+msgid "\"Filter Editor\" window height"
+msgstr "Altura de la ventana ÂEditor de filtrosÂ"
 
-#: ../mail/evolution-mail.schemas.in.h:128
-msgid "Mail browser maximized"
-msgstr "Examinador de correo maximizado"
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"Initial height of the \"Filter Editor\" 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:129
-msgid "Mail browser width"
-msgstr "Anchura del examinador de correo"
+#: ../mail/evolution-mail.schemas.in.h:215
+msgid "\"Filter Editor\" window maximize state"
+msgstr "Estado maximizado de la ventana ÂEditor de filtrosÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:216
+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."
+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:141
-msgid "Original message."
-msgstr "Mensaje original."
+#: ../mail/evolution-mail.schemas.in.h:217
+msgid "\"Filter Editor\" window width"
+msgstr "Anchura de la ventana ÂEditor de filtrosÂ"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
 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"
+"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:199
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user."
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
 msgstr ""
-"Indica cÃmo ordenar cuentas en un Ãrbol de carpetas usado en una vista de "
-"Correo. Cuando està establecido a cierto las cuentas se ordenan "
-"alfabÃticamente, con la excepciÃn de En este equipo y Carpetas de bÃsqueda, "
-"de lo contrario las carpetas se ordenan por el orden dado por el usuario."
+"Indica si se debe comprobar si hay mensajes nuevos al iniciar Evolution. "
+"Incluye tambiÃn el envÃo de mensajes en la bandeja de salida."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
+"Whether check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
-"El texto insertado al reenviar un mensaje, diciendo que el a continuaciÃn "
-"està el mensaje reenviado."
+"Indica si se debe comprobar si hay mensajes nuevos en todas las cuentas "
+"activas independientemente del conteo en la opciÃn ÂComprobar si hay mensajes "
+"nuevos cada X minutos al iniciar Evolution. Esta opciÃn sÃlo se usa junto "
+"con la opciÃn Âsend_recv_on_startÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:223
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Altura de la ventana ÂEnviar y recibir correoÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr ""
-"El texto insertado al responder a un mensaje (publicando por encima), "
-"atribuyendo el mensaje a su autor original."
+"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:208
+#: ../mail/evolution-mail.schemas.in.h:225
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "Estado maximizado de la ventana ÂEnviar y recibir correoÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
 msgstr ""
-"El texto insertado al responder a un mensaje, atribuyendo el mensaje a su "
-"autor original."
+"Estado inicial maximizado de la ventana ÂEnviar y recibir correoÂ. El valor "
+"se actualiza cuando el usuario maximiza o reduce la ventana. Nota: Evolution "
+"no usa este valor en particular ya que la ventana ÂEnviar y recibir correo "
+"no se puede maximizar. Esta clave existe sÃlo como un detalle de "
+"implementaciÃn."
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:227
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Anchura de la ventana ÂEnviar y recibir correoÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
-"Este ajuste especifica si las conversaciones, de forma predeterminada, "
-"deberÃan estar en estado expandido o contraÃdo. Evolution necesita "
-"reiniciarse para aplicarlo."
+"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:220
+#: ../mail/evolution-mail.schemas.in.h:229
+msgid "\"Search Folder Editor\" window height"
+msgstr "Altura de la ventana ÂEditor de carpetas de bÃsquedaÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr ""
-"Este valor puede ser una cadena vacÃa, lo que significa que usarà la carpeta "
-"ImÃgenes del sistema, habitualmente ~/ImÃgenes. TambiÃn se usarà esta "
-"carpeta cuando la ruta configurada no apunte a la carpeta existente."
+"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:231
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "Estado maximizado de la ventana ÂEditor de filtrosÂ"
 
 #: ../mail/evolution-mail.schemas.in.h:232
 msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"Indica si se debe comprobar si hay mensajes nuevos en todas las cuentas "
-"activas independientemente del conteo en la opciÃn ÂComprobar si hay mensajes "
-"nuevos cada X minutos al iniciar Evolution. Esta opciÃn sÃlo se usa junto "
-"con la opciÃn Âsend_recv_on_startÂ."
+"Estado inicial maximizado de la ventana ÂEditor de carpetas de bÃsquedaÂ. 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 "
+"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:233
+msgid "\"Search Folder Editor\" window width"
+msgstr "Anchura de la ventana ÂEditor de carpetas de bÃsquedaÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
-"Indica si se debe comprobar si hay mensajes nuevos al iniciar Evolution. "
-"Incluye tambiÃn el envÃo de mensajes en la bandeja de salida."
+"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:235
+msgid "Drag'n'drop export format"
+msgstr "Formato de exportaciÃn al arrastrar y soltar"
+
+#: ../mail/evolution-mail.schemas.in.h:236
+msgid ""
+"Define the email export format when doing drag'n'drop. Possible values are : "
+"mbox or pdf"
+msgstr ""
+"Definir el formato de exportaciÃn de correo-e al arrastrar y soltar. Los "
+"valores posibles son Âmbox o ÂpdfÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:237
+msgid "Format of the drag'n'drop export filename"
+msgstr "Formato del nombre del archivo al exportar arrastrando y soltando"
 
 #: ../mail/evolution-mail.schemas.in.h:238
-msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgid ""
+"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
+"(: email sent date), 2 (: drag'n'drop date)"
 msgstr ""
-"Indica si se deben mostrar las carpetas locales (En este equipo) en un Ãrbol "
-"de carpetas."
+"El nombre del archivo exportado serÃ: AAAmmDDHHMMSS_titulo_correo-e. Los "
+"valores posibles son: Â1Â (fecha de envÃo del correo-e) y Â2Â(fecha de "
+"arrastrar y soltar)"
 
 #: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
@@ -13358,18 +13363,10 @@ msgstr[1] ""
 "Â%sÂ."
 
 #: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "InformaciÃn de la cuenta"
+msgid "Set custom junk header"
+msgstr "Establecer cabecera de SPAM personalizada"
 
 #: ../mail/mail-config.ui.h:2
-msgid "Add Ne_w Signature..."
-msgstr "AÃadir firma _nuevaâ"
-
-#: ../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:4
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
@@ -13377,806 +13374,818 @@ msgstr ""
 "Todos los correos-e nuevos con cabeceras que coincidan con en contenido dado "
 "se filtrarÃn automÃticamente como SPAM"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:6
-msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr ""
-"Permitir a una li_sta de correo redireccionar una respuesta privada a la "
-"lista"
+#: ../mail/mail-config.ui.h:3
+msgid "Header name"
+msgstr "Nombre de la cabecera"
 
-#: ../mail/mail-config.ui.h:7
-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:4
+msgid "Header content"
+msgstr "Contenido de la cabecera"
 
-#: ../mail/mail-config.ui.h:8
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Siempre enviar _copia de carbÃn (Cc) a:"
+#: ../mail/mail-config.ui.h:5
+msgid "_Add Signature"
+msgstr "_AÃadir firma"
 
-#: ../mail/mail-config.ui.h:9
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Siempre enviar copia de carbÃn _oculta (Cco) a:"
+#: ../mail/mail-config.ui.h:6
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+"La salida de este script se usarà como su firma. \n"
+"El nombre que especifique se usarà Ãnicamente \n"
+"para mostrarlo por pantalla. "
 
 #: ../mail/mail-config.ui.h:10
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Siempre _confiar en las claves de mi almacÃn al cifrar"
+msgid "_Script:"
+msgstr "_Script:"
 
 #: ../mail/mail-config.ui.h:11
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "Siempre cifrar a _mà mismo cuando envÃe correo cifrado"
+msgid "Default Behavior"
+msgstr "Comportamiento predeterminado"
 
 #: ../mail/mail-config.ui.h:12
-msgid "Always request rea_d receipt"
-msgstr "Siempre _solicitar confirmaciÃn de lectura"
+msgid "Format messages in _HTML"
+msgstr "Dar formato _HTML a los mensajes"
 
 #: ../mail/mail-config.ui.h:13
-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:15
-#: ../modules/addressbook/addressbook-config.c:1090
-msgid "Authentication"
-msgstr "AutenticaciÃn"
-
-#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "Insertar imÃgenes de _emoticonos automÃticamente"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:14
+msgid "Always request rea_d receipt"
+msgstr "Siempre _solicitar confirmaciÃn de lectura"
+
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "Conjunto de carac_teres:"
 
+#: ../mail/mail-config.ui.h:17
+msgid "Replies and Forwards"
+msgstr "Respuestas y reenvÃos"
+
 #: ../mail/mail-config.ui.h:18
-msgid "Ch_eck for Supported Types"
-msgstr "C_omprobar tipos soportados"
+msgid "_Reply style:"
+msgstr "Estilo de _respuesta:"
 
 #: ../mail/mail-config.ui.h:19
-msgid "Check cu_stom headers for junk"
-msgstr "Compro_bar las cabeceras personalizadas contra SPAM"
+msgid "_Forward style:"
+msgstr "_Estilo de reenvÃo:"
 
 #: ../mail/mail-config.ui.h:20
-msgid "Check for new _messages on start"
-msgstr "Comprobar si hay mensajes _nuevos al inicio"
+msgid "Start _typing at the bottom on replying"
+msgstr "Comenzar a _escribir en la parte final al responder"
 
 #: ../mail/mail-config.ui.h:21
-msgid "Check for new messa_ges in all active accounts"
-msgstr "Comprobar si hay _mensajes nuevos en todas las cuentas activas"
+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:22
-msgid "Check incoming _messages for junk"
-msgstr "Comprobar si los _mensajes entrantes son basura"
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "Ignorar ÂResponder a:Â para listas de correo"
 
 #: ../mail/mail-config.ui.h:23
-msgid "Check spelling while I _type"
-msgstr "Comprobar orto_grafÃa mientras se escribe"
+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:24
-msgid "Cle_ar"
-msgstr "_Vaciar"
-
-#: ../mail/mail-config.ui.h:25
-msgid "Clea_r"
-msgstr "Vacia_r"
+msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+msgstr ""
+"_Firmar mensajes digitalmente cuando el mensaje original esteÌ firmado (PGP o "
+"S/MIME)"
 
 #: ../mail/mail-config.ui.h:26
-msgid "Color for _misspelled words:"
-msgstr "Color para las palabras _mal escritas:"
-
-#: ../mail/mail-config.ui.h:27
-msgid "Composing Messages"
-msgstr "Redactar mensajes"
+msgid "Sig_natures"
+msgstr "_Firmas"
 
 #: ../mail/mail-config.ui.h:28
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "ConfiguraciÃn"
+msgid "Signatures"
+msgstr "Firmas"
 
 #: ../mail/mail-config.ui.h:29
-msgid "Confirm _when expunging a folder"
-msgstr "_Confirmar antes de purgar una carpeta"
+msgid "_Languages"
+msgstr "_Idiomas"
 
 #: ../mail/mail-config.ui.h:30
-msgid "Confirmations"
-msgstr "Confirmaciones"
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"La lista de idiomas de aquà refleja Ãnicamente los idiomas para los cuÃles "
+"hay instalado un diccionario."
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:188
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
-msgid "Date/Time Format"
-msgstr "Formato de la fecha y hora"
+msgid "Languages Table"
+msgstr "Tabla de idiomas"
 
 #: ../mail/mail-config.ui.h:33
-msgid "Default Behavior"
-msgstr "Comportamiento predeterminado"
+msgid "Check spelling while I _type"
+msgstr "Comprobar orto_grafÃa mientras se escribe"
 
 #: ../mail/mail-config.ui.h:34
-msgid "Default character e_ncoding:"
-msgstr "_CodificaciÃn de caracteres predeterminada:"
+msgid "Color for _misspelled words:"
+msgstr "Color para las palabras _mal escritas:"
 
 #: ../mail/mail-config.ui.h:35
-msgid "Delete Mail"
-msgstr "Eliminar correo-e"
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Pick a color"
+msgstr "Elija un color"
 
 #: ../mail/mail-config.ui.h:36
-msgid "Delete junk messages on e_xit"
-msgstr "Eliminar los mensajes SPAM al _salir"
+msgid "Spell Checking"
+msgstr "OrtografÃa"
 
-#: ../mail/mail-config.ui.h:39
-msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+#: ../mail/mail-config.ui.h:37
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
 msgstr ""
-"_Firmar mensajes digitalmente cuando el mensaje original esteÌ firmado (PGP o "
-"S/MIME)"
+"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:40
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "Firmar digitalmente los mensajes s_alientes (por omisiÃn)"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:39
+msgid "Sending a message with an _empty subject line"
+msgstr "Enviando un correo con una lÃnea de asunto _vacÃa"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:41
-msgid "Displayed Message Headers"
-msgstr "Cabeceras mostradas del mensaje"
-
-#: ../mail/mail-config.ui.h:42
-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"
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Enviando la respuesta sÃlo a los destinatarios definidos en _Cco"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:43
-msgid "Do not quote"
-msgstr "No entrecomillar"
-
-#: ../mail/mail-config.ui.h:44
-msgid "Drafts _Folder:"
-msgstr "Carpeta de _borradores:"
+msgid "Sending a _private reply to a mailing list message"
+msgstr "Enviando una respuesta priva_da a una lista de correo"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:45
-msgid "Email _Address:"
-msgstr "Dir_ecciÃn de correo-e:"
+msgid "Sending a reply to a large _number of recipients"
+msgstr "Enviando la respuesta a un gran _nÃmero de destinatarios"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:47
-msgid "Empty trash folders on e_xit"
-msgstr "Vaciar _papelera al salir"
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr ""
+"Permitir a una li_sta de correo redireccionar una respuesta privada a la "
+"lista"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:49
-msgid "Encry_ption certificate:"
-msgstr "Certificado de ci_frado:"
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr ""
+"Enviando un mensaje con destinata_rios no introducidos como direcciones de "
+"correo"
 
 #: ../mail/mail-config.ui.h:50
-msgid "Encrypt out_going messages (by default)"
-msgstr "Cifrar mensajes _salientes (por omisiÃn)"
-
-#: ../mail/mail-config.ui.h:51
-msgid "Encryption:"
-msgstr "Cifrado:"
+msgid "Confirmations"
+msgstr "Confirmaciones"
 
 #: ../mail/mail-config.ui.h:52
-msgid "F_all back to threading messages by subject"
-msgstr "Agrupar los mensajes por _asunto"
+msgid "SHA1"
+msgstr "SHA1"
 
 #: ../mail/mail-config.ui.h:53
-msgid "Fix_ed Width Font:"
-msgstr "TipografÃa de anchura _fija:"
+msgid "SHA256"
+msgstr "SHA256"
 
 #: ../mail/mail-config.ui.h:54
-msgid "Format messages in _HTML"
-msgstr "Dar formato _HTML a los mensajes"
+msgid "SHA384"
+msgstr "SHA384"
 
 #: ../mail/mail-config.ui.h:55
-msgid "Full Nam_e:"
-msgstr "Nombre co_mpleto:"
+msgid "SHA512"
+msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:57
-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:56 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "am"
 
-#: ../mail/mail-config.ui.h:58
-msgid "HTML Messages"
-msgstr "Mensajes HTML"
+#: ../mail/mail-config.ui.h:57 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "por"
 
 #: ../mail/mail-config.ui.h:59
-msgid "H_TTP Proxy:"
-msgstr "Proxy H_TTP:"
+msgid "Inline (Outlook style)"
+msgstr "En lÃnea (estilo Outlook)"
 
 #: ../mail/mail-config.ui.h:60
-msgid "Header content"
-msgstr "Contenido de la cabecera"
+msgid "Quoted"
+msgstr "Citado"
 
 #: ../mail/mail-config.ui.h:61
-msgid "Header name"
-msgstr "Nombre de la cabecera"
+msgid "Do not quote"
+msgstr "No entrecomillar"
 
 #: ../mail/mail-config.ui.h:62
-msgid "Headers"
-msgstr "Cabeceras"
+msgid "Inline"
+msgstr "En lÃnea"
 
-# Esta cadena debe permanecer asÃ
 #: ../mail/mail-config.ui.h:63
-msgid "Highlight _quotations with"
-msgstr "Resaltar texto _citado con este color:"
+msgid "Proxy Settings"
+msgstr "Ajustes del proxy"
 
 #: ../mail/mail-config.ui.h:64
-msgid "Ignore Reply-To: for mailing lists"
-msgstr "Ignorar ÂResponder a:Â para listas de correo"
+msgid "_Use system defaults"
+msgstr "_Usar los valores predeterminados del sistema"
 
 #: ../mail/mail-config.ui.h:65
-msgid "Inline"
-msgstr "En lÃnea"
+msgid "_Direct connection to the Internet"
+msgstr "ConexiÃn _directa a Internet"
 
 #: ../mail/mail-config.ui.h:66
-msgid "Inline (Outlook style)"
-msgstr "En lÃnea (estilo Outlook)"
+msgid "_Manual proxy configuration:"
+msgstr "ConfiguraciÃn _manual del proxy:"
 
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
-msgid "Labels"
-msgstr "Etiquetas"
+#: ../mail/mail-config.ui.h:67
+msgid "H_TTP Proxy:"
+msgstr "Proxy H_TTP:"
+
+#: ../mail/mail-config.ui.h:68
+msgid "_Secure HTTP Proxy:"
+msgstr "Proxy HTTP _seguro:"
 
 #: ../mail/mail-config.ui.h:69
-msgid "Languages Table"
-msgstr "Tabla de idiomas"
+msgid "SOC_KS Proxy:"
+msgstr "Proxy SOC_KS:"
 
 #: ../mail/mail-config.ui.h:70
-msgid "Loading Images"
-msgstr "Cargando imÃgenes"
+msgid "No _Proxy for:"
+msgstr "Sin _proxy para:"
 
 #: ../mail/mail-config.ui.h:71
-msgid "Mail Headers Table"
-msgstr "Tabla de cabeceras de correo"
+msgid "Port:"
+msgstr "Puerto:"
 
 #: ../mail/mail-config.ui.h:72
-msgid "Mailbox location"
-msgstr "DirecciÃn del buzÃn"
+msgid "Use Authe_ntication"
+msgstr "Usar aute_nticaciÃn"
 
 #: ../mail/mail-config.ui.h:73
-msgid "Message Display"
-msgstr "Mostrado de mensajes"
+msgid "Us_ername:"
+msgstr "_Usuario:"
 
 #: ../mail/mail-config.ui.h:74
-msgid "Message Receipts"
-msgstr "Destinatarios del mensaje"
+msgid "Pass_word:"
+msgstr "_ContraseÃa:"
+
+#: ../mail/mail-config.ui.h:75
+msgid "Start up"
+msgstr "Inicio"
 
 #: ../mail/mail-config.ui.h:76
-msgid "No _Proxy for:"
-msgstr "Sin _proxy para:"
+msgid "Check for new _messages on start"
+msgstr "Comprobar si hay mensajes _nuevos al inicio"
 
-#: ../mail/mail-config.ui.h:77 ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "Sin cifrado"
+#: ../mail/mail-config.ui.h:77
+msgid "Check for new messa_ges in all active accounts"
+msgstr "Comprobar si hay _mensajes nuevos en todas las cuentas activas"
 
 #: ../mail/mail-config.ui.h:78
-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."
+msgid "Message Display"
+msgstr "Mostrado de mensajes"
 
 #: ../mail/mail-config.ui.h:79
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
-msgid "Optional Information"
-msgstr "InformaciÃn opcional"
+msgid "_Use the same fonts as other applications"
+msgstr "_Usar las mismas tipografÃas que en otras aplicaciones"
+
+#: ../mail/mail-config.ui.h:80
+msgid "S_tandard Font:"
+msgstr "TipografÃa _estÃndar:"
 
 #: ../mail/mail-config.ui.h:81
-msgid "Or_ganization:"
-msgstr "Organi_zaciÃn:"
+msgid "Select HTML fixed width font"
+msgstr "Selecciona letra de anchura fija para HTML"
 
 #: ../mail/mail-config.ui.h:82
-msgid "PGP/GPG _Key ID:"
-msgstr "ID de c_lave GPG/PGP:"
+msgid "Select HTML variable width font"
+msgstr "Selecciona letra de anchura variable en HTML"
 
 #: ../mail/mail-config.ui.h:83
-msgid "Pass_word:"
-msgstr "_ContraseÃa:"
+msgid "Fix_ed Width Font:"
+msgstr "TipografÃa de anchura _fija:"
 
+# Esta cadena debe permanecer asÃ
 #: ../mail/mail-config.ui.h:84
-msgid "Personal Details:"
-msgstr "Detalles personales:"
+msgid "Highlight _quotations with"
+msgstr "Resaltar texto _citado con este color:"
 
+# Esta traducciÃn debe mantenerse asÃ
 #: ../mail/mail-config.ui.h:85
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
-msgid "Pick a color"
-msgstr "Elija un color"
+msgid "color"
+msgstr "color"
 
 #: ../mail/mail-config.ui.h:86
-msgid "Port:"
-msgstr "Puerto:"
+msgid "Default character e_ncoding:"
+msgstr "_CodificaciÃn de caracteres predeterminada:"
 
 #: ../mail/mail-config.ui.h:87
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
+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:88
+msgid "F_all back to threading messages by subject"
+msgstr "Agrupar los mensajes por _asunto"
 
 #: ../mail/mail-config.ui.h:89
-msgid "Proxy Settings"
-msgstr "Ajustes del proxy"
+msgid "Delete Mail"
+msgstr "Eliminar correo-e"
 
 #: ../mail/mail-config.ui.h:90
-msgid "Quoted"
-msgstr "Citado"
+msgid "Empty trash folders on e_xit"
+msgstr "Vaciar _papelera al salir"
 
 #: ../mail/mail-config.ui.h:91
-msgid "Re_member password"
-msgstr "_Recordar contraseÃa"
+msgid "Confirm _when expunging a folder"
+msgstr "_Confirmar antes de purgar una carpeta"
 
-#: ../mail/mail-config.ui.h:92
-msgid "Re_ply-To:"
-msgstr "Res_ponder a:"
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.ui.h:93
+msgid "_Show animated images"
+msgstr "_Mostrar las imÃgenes animadas"
 
 #: ../mail/mail-config.ui.h:94
-msgid "Remember _password"
-msgstr "Recordar contrase_Ãa"
+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:95
-msgid "Replies and Forwards"
-msgstr "Respuestas y reenvÃos"
+msgid "Loading Images"
+msgstr "Cargando imÃgenes"
 
 #: ../mail/mail-config.ui.h:96
-msgid "Required Information"
-msgstr "InformaciÃn requerida"
+msgid "_Never load images from the Internet"
+msgstr "_Nunca cargar imÃgenes desde Internet"
 
 #: ../mail/mail-config.ui.h:97
-msgid "SHA1"
-msgstr "SHA1"
+msgid "_Load images only in messages from contacts"
+msgstr "Cargar i_mÃgenes en los mensajes de mis contactos"
 
 #: ../mail/mail-config.ui.h:98
-msgid "SHA256"
-msgstr "SHA256"
+msgid "_Always load images from the Internet"
+msgstr "_Siempre cargar las imÃgenes desde Internet"
 
 #: ../mail/mail-config.ui.h:99
-msgid "SHA384"
-msgstr "SHA384"
+msgid "HTML Messages"
+msgstr "Mensajes HTML"
 
-#: ../mail/mail-config.ui.h:100
-msgid "SHA512"
-msgstr "SHA512"
+#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "Etiquetas"
 
 #: ../mail/mail-config.ui.h:101
-msgid "SOC_KS Proxy:"
-msgstr "Proxy SOC_KS:"
+msgid "Sender Photograph"
+msgstr "Foto del remitente"
 
-#: ../mail/mail-config.ui.h:102 ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "Cifrado SSL"
+#: ../mail/mail-config.ui.h:102
+msgid "_Show the photograph of sender in the message preview"
+msgstr "_Mostrar la foto del remitente en la vista previa del mensaje"
 
 #: ../mail/mail-config.ui.h:103
-msgid "SSL is not supported in this build of Evolution"
-msgstr "Esta compilaciÃn de Evolution no soporta SSL"
-
-#: ../mail/mail-config.ui.h:104
 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:104
+msgid "Displayed Message Headers"
+msgstr "Cabeceras mostradas del mensaje"
+
 #: ../mail/mail-config.ui.h:105
-msgid "S_elect..."
-msgstr "S_eleccionarâ"
+msgid "Mail Headers Table"
+msgstr "Tabla de cabeceras de correo"
 
 #: ../mail/mail-config.ui.h:106
-msgid "S_end message receipts:"
-msgstr "_Enviar confirmaciones de mensajes:"
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Date/Time Format"
+msgstr "Formato de la fecha y hora"
 
 #: ../mail/mail-config.ui.h:107
-msgid "S_tandard Font:"
-msgstr "TipografÃa _estÃndar:"
+msgid "Headers"
+msgstr "Cabeceras"
 
 #: ../mail/mail-config.ui.h:108
-msgid "Secure MIME (S/MIME)"
-msgstr "MIME seguro (S/MIME)"
+msgid "Check incoming _messages for junk"
+msgstr "Comprobar si los _mensajes entrantes son basura"
+
+#: ../mail/mail-config.ui.h:109
+msgid "Delete junk messages on e_xit"
+msgstr "Eliminar los mensajes SPAM al _salir"
 
 #: ../mail/mail-config.ui.h:110
-msgid "Select HTML fixed width font"
-msgstr "Selecciona letra de anchura fija para HTML"
+msgid "Check cu_stom headers for junk"
+msgstr "Compro_bar las cabeceras personalizadas contra SPAM"
 
 #: ../mail/mail-config.ui.h:111
-msgid "Select HTML variable width font"
-msgstr "Selecciona letra de anchura variable en HTML"
+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:112
-msgid "Sender Photograph"
-msgstr "Foto del remitente"
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:115
-msgid "Sending a _private reply to a mailing list message"
-msgstr "Enviando una respuesta priva_da a una lista de correo"
+msgid "_Lookup in local address book only"
+msgstr "_Buscar sÃlo en la libreta de direcciones local"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:117
-msgid "Sending a message with _recipients not entered as mail addresses"
+#: ../mail/mail-config.ui.h:113
+msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
-"Enviando un mensaje con destinata_rios no introducidos como direcciones de "
-"correo"
+"Esta opciÃn se omitirà si se encuentra alguna coincidencia para una cabecera "
+"de SPAM personalizada."
+
+#: ../mail/mail-config.ui.h:115 ../modules/addressbook/ldap-config.ui.h:3
+msgid "No encryption"
+msgstr "Sin cifrado"
+
+#: ../mail/mail-config.ui.h:116 ../modules/addressbook/ldap-config.ui.h:1
+msgid "TLS encryption"
+msgstr "Cifrado TLS"
+
+#: ../mail/mail-config.ui.h:117 ../modules/addressbook/ldap-config.ui.h:2
+msgid "SSL encryption"
+msgstr "Cifrado SSL"
+
+#: ../mail/mail-config.ui.h:118
+msgid "Special Folders"
+msgstr "Carpetas especiales"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:119
-msgid "Sending a message with an _empty subject line"
-msgstr "Enviando un correo con una lÃnea de asunto _vacÃa"
+msgid "Drafts _Folder:"
+msgstr "Carpeta de _borradores:"
+
+#: ../mail/mail-config.ui.h:120
+msgid "Sent _Messages Folder:"
+msgstr "Carpeta de _mensajes enviados:"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:121
-msgid "Sending a message with only _Bcc recipients defined"
-msgstr "Enviando la respuesta sÃlo a los destinatarios definidos en _Cco"
+msgid "_Trash Folder:"
+msgstr "Carpeta de p_apelera:"
+
+#: ../mail/mail-config.ui.h:122
+msgid "_Junk Folder:"
+msgstr "Carpeta de _SPAM:"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:123
-msgid "Sending a reply to a large _number of recipients"
-msgstr "Enviando la respuesta a un gran _nÃmero de destinatarios"
+msgid "Composing Messages"
+msgstr "Redactar mensajes"
 
 #: ../mail/mail-config.ui.h:124
-msgid "Sent _Messages Folder:"
-msgstr "Carpeta de _mensajes enviados:"
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Siempre enviar copia de carbÃn _oculta (Cco) a:"
 
 #: ../mail/mail-config.ui.h:125
-msgid "Ser_ver requires authentication"
-msgstr "El ser_vidor requiere autenticaciÃn"
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Siempre enviar _copia de carbÃn (Cc) a:"
 
 #: ../mail/mail-config.ui.h:126
-msgid "Server Configuration"
-msgstr "ConfiguraciÃn del servidor"
+msgid "Message Receipts"
+msgstr "Destinatarios del mensaje"
 
 #: ../mail/mail-config.ui.h:127
-msgid "Server _Type:"
-msgstr "_Tipo de servidor:"
+msgid "S_end message receipts:"
+msgstr "_Enviar confirmaciones de mensajes:"
 
-#: ../mail/mail-config.ui.h:130
-msgid "Set custom junk header"
-msgstr "Establecer cabecera de SPAM personalizada"
+#: ../mail/mail-config.ui.h:128
+msgid "Account Information"
+msgstr "InformaciÃn de la cuenta"
+
+#: ../mail/mail-config.ui.h:129
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+"Teclee el nombre por el que quiere identificar a esta cuenta.\n"
+"Por ejemplo: ÂTrabajo o ÂPersonalÂ"
 
 #: ../mail/mail-config.ui.h:131
-msgid "Si_gning algorithm:"
-msgstr "Algoritmo de _firma:"
+msgid "Required Information"
+msgstr "InformaciÃn requerida"
 
 #: ../mail/mail-config.ui.h:132
-msgid "Sig_natures"
-msgstr "_Firmas"
+msgid "Email _Address:"
+msgstr "Dir_ecciÃn de correo-e:"
 
 #: ../mail/mail-config.ui.h:133
-msgid "Sig_ning certificate:"
-msgstr "Certificado de _firma:"
+msgid "Full Nam_e:"
+msgstr "Nombre co_mpleto:"
 
 #: ../mail/mail-config.ui.h:134
-msgid "Signat_ure:"
-msgstr "_Firma:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "InformaciÃn opcional"
 
 #: ../mail/mail-config.ui.h:135
-msgid "Signatures"
-msgstr "Firmas"
+msgid "Signat_ure:"
+msgstr "_Firma:"
 
 #: ../mail/mail-config.ui.h:136
-msgid "Signing _algorithm:"
-msgstr "_Algoritmo de firma:"
+msgid "Add Ne_w Signature..."
+msgstr "AÃadir firma _nuevaâ"
 
 #: ../mail/mail-config.ui.h:137
-msgid "Special Folders"
-msgstr "Carpetas especiales"
+msgid "Or_ganization:"
+msgstr "Organi_zaciÃn:"
 
 #: ../mail/mail-config.ui.h:138
-msgid "Spell Checking"
-msgstr "OrtografÃa"
+msgid "Re_ply-To:"
+msgstr "Res_ponder a:"
 
 #: ../mail/mail-config.ui.h:139
-msgid "Start _typing at the bottom on replying"
-msgstr "Comenzar a _escribir en la parte final al responder"
+msgid "_Make this my default account"
+msgstr "_Hacer que Ãsta sea mi cuenta predeterminada"
 
 #: ../mail/mail-config.ui.h:140
-msgid "Start up"
-msgstr "Inicio"
+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:141 ../modules/addressbook/ldap-config.ui.h:21
-msgid "TLS encryption"
-msgstr "Cifrado TLS"
+#: ../mail/mail-config.ui.h:141
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
 
 #: ../mail/mail-config.ui.h:142
-msgid "T_ype:"
-msgstr "T_ipo:"
+msgid "PGP/GPG _Key ID:"
+msgstr "ID de c_lave GPG/PGP:"
 
 #: ../mail/mail-config.ui.h:143
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"La lista de idiomas de aquà refleja Ãnicamente los idiomas para los cuÃles "
-"hay instalado un diccionario."
-
-#: ../mail/mail-config.ui.h:144
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
-"La salida de este script se usarà como su firma. \n"
-"El nombre que especifique se usarà Ãnicamente \n"
-"para mostrarlo por pantalla. "
+msgid "Si_gning algorithm:"
+msgstr "Algoritmo de _firma:"
+
+#: ../mail/mail-config.ui.h:144
+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:145
+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:146
+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:147
-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:"
+msgid "Secure MIME (S/MIME)"
+msgstr "MIME seguro (S/MIME)"
 
 #: ../mail/mail-config.ui.h:148
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-"Teclee el nombre por el que quiere identificar a esta cuenta.\n"
-"Por ejemplo: ÂTrabajo o ÂPersonalÂ"
+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:149
+msgid "Encrypt out_going messages (by default)"
+msgstr "Cifrar mensajes _salientes (por omisiÃn)"
 
 #: ../mail/mail-config.ui.h:150
-msgid "Us_ername:"
-msgstr "_Usuario:"
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "Firmar digitalmente los mensajes s_alientes (por omisiÃn)"
 
 #: ../mail/mail-config.ui.h:151
-msgid "Use Authe_ntication"
-msgstr "Usar aute_nticaciÃn"
+msgid "Encry_ption certificate:"
+msgstr "Certificado de ci_frado:"
 
 #: ../mail/mail-config.ui.h:152
-msgid "User _Name:"
-msgstr "_Nombre de usuario:"
+msgid "Sig_ning certificate:"
+msgstr "Certificado de _firma:"
+
+#: ../mail/mail-config.ui.h:153
+msgid "S_elect..."
+msgstr "S_eleccionarâ"
 
 #: ../mail/mail-config.ui.h:154
-msgid "_Add Signature"
-msgstr "_AÃadir firma"
+msgid "Clea_r"
+msgstr "Vacia_r"
 
 #: ../mail/mail-config.ui.h:155
-msgid "_Always load images from the Internet"
-msgstr "_Siempre cargar las imÃgenes desde Internet"
-
-#: ../mail/mail-config.ui.h:156
-msgid "_Authentication Type"
-msgstr "Tipo de _autenticaciÃn"
+msgid "Signing _algorithm:"
+msgstr "_Algoritmo de firma:"
 
 #: ../mail/mail-config.ui.h:157
-msgid "_Direct connection to the Internet"
-msgstr "ConexiÃn _directa a Internet"
+msgid "Cle_ar"
+msgstr "_Vaciar"
 
 #: ../mail/mail-config.ui.h:158
-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:159
-msgid "_Forward style:"
-msgstr "_Estilo de reenvÃo:"
+msgid "Server _Type:"
+msgstr "_Tipo de servidor:"
 
 #: ../mail/mail-config.ui.h:160
-msgid "_Junk Folder:"
-msgstr "Carpeta de _SPAM:"
+msgid "description"
+msgstr "descripciÃn"
 
 #: ../mail/mail-config.ui.h:161
-msgid "_Keep signature above the original message on replying"
-msgstr "_Mantener la firma por encima del mensaje original al responder"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+msgid "Configuration"
+msgstr "ConfiguraciÃn"
 
 #: ../mail/mail-config.ui.h:162
-msgid "_Languages"
-msgstr "_Idiomas"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../mail/mail-config.ui.h:163
-msgid "_Load images only in messages from contacts"
-msgstr "Cargar i_mÃgenes en los mensajes de mis contactos"
-
-#: ../mail/mail-config.ui.h:164
-msgid "_Lookup in local address book only"
-msgstr "_Buscar sÃlo en la libreta de direcciones local"
+msgid "User _Name:"
+msgstr "_Nombre de usuario:"
 
 #: ../mail/mail-config.ui.h:165
-msgid "_Make this my default account"
-msgstr "_Hacer que Ãsta sea mi cuenta predeterminada"
+msgid "Mailbox location"
+msgstr "DirecciÃn del buzÃn"
 
-#: ../mail/mail-config.ui.h:166
-msgid "_Manual proxy configuration:"
-msgstr "ConfiguraciÃn _manual del proxy:"
+#: ../mail/mail-config.ui.h:167
+msgid "_Use secure connection:"
+msgstr "Usar _conexiÃn segura:"
 
 #: ../mail/mail-config.ui.h:168
-msgid "_Never load images from the Internet"
-msgstr "_Nunca cargar imÃgenes desde Internet"
+msgid "SSL is not supported in this build of Evolution"
+msgstr "Esta compilaciÃn de Evolution no soporta SSL"
 
-#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:29
-msgid "_Port:"
-msgstr "_Puerto:"
+#: ../mail/mail-config.ui.h:169
+msgid "_Authentication Type"
+msgstr "Tipo de _autenticaciÃn"
+
+#: ../mail/mail-config.ui.h:170
+msgid "Ch_eck for Supported Types"
+msgstr "C_omprobar tipos soportados"
 
 #: ../mail/mail-config.ui.h:171
-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"
+msgid "Re_member password"
+msgstr "_Recordar contraseÃa"
 
 #: ../mail/mail-config.ui.h:172
-msgid "_Reply style:"
-msgstr "Estilo de _respuesta:"
+msgid "Server Configuration"
+msgstr "ConfiguraciÃn del servidor"
 
-#: ../mail/mail-config.ui.h:173
-msgid "_Script:"
-msgstr "_Script:"
+#: ../mail/mail-config.ui.h:173 ../modules/addressbook/ldap-config.ui.h:13
+msgid "_Port:"
+msgstr "_Puerto:"
 
 #: ../mail/mail-config.ui.h:174
-msgid "_Secure HTTP Proxy:"
-msgstr "Proxy HTTP _seguro:"
-
-#: ../mail/mail-config.ui.h:176
-#: ../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:178
-msgid "_Show animated images"
-msgstr "_Mostrar las imÃgenes animadas"
-
-#: ../mail/mail-config.ui.h:179
-msgid "_Show the photograph of sender in the message preview"
-msgstr "_Mostrar la foto del remitente en la vista previa del mensaje"
-
-#: ../mail/mail-config.ui.h:180
-msgid "_Trash Folder:"
-msgstr "Carpeta de p_apelera:"
-
-#: ../mail/mail-config.ui.h:181
-msgid "_Use secure connection:"
-msgstr "Usar _conexiÃn segura:"
-
-#: ../mail/mail-config.ui.h:182
-msgid "_Use system defaults"
-msgstr "_Usar los valores predeterminados del sistema"
+msgid "Ser_ver requires authentication"
+msgstr "El ser_vidor requiere autenticaciÃn"
 
-#: ../mail/mail-config.ui.h:183
-msgid "_Use the same fonts as other applications"
-msgstr "_Usar las mismas tipografÃas que en otras aplicaciones"
+#: ../mail/mail-config.ui.h:175
+#: ../modules/addressbook/addressbook-config.c:1090
+msgid "Authentication"
+msgstr "AutenticaciÃn"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
-msgid "a"
-msgstr "am"
+#: ../mail/mail-config.ui.h:176
+msgid "T_ype:"
+msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:185 ../smime/gui/smime-ui.ui.h:49
-msgid "b"
-msgstr "por"
+#: ../mail/mail-config.ui.h:177
+msgid "Remember _password"
+msgstr "Recordar contrase_Ãa"
 
-# Esta traducciÃn debe mantenerse asÃ
-#: ../mail/mail-config.ui.h:186
-msgid "color"
-msgstr "color"
+#: ../mail/mail-config.ui.h:178
+msgid "Personal Details:"
+msgstr "Detalles personales:"
 
 #: ../mail/mail-config.ui.h:187
-msgid "description"
-msgstr "descripciÃn"
+msgid "Encryption:"
+msgstr "Cifrado:"
 
 #: ../mail/mail-config.ui.h:188
-msgid "label"
-msgstr "etiqueta"
-
-#: ../mail/mail-config.ui.h:189
 msgid "none"
 msgstr "ninguna"
 
+#: ../mail/mail-config.ui.h:189
+msgid "label"
+msgstr "etiqueta"
+
 #: ../mail/mail-dialogs.ui.h:1
+msgid "Search Folder Sources"
+msgstr "OrÃgenes de las carpetas de bÃsqueda"
+
+#: ../mail/mail-dialogs.ui.h:2
+msgid "All local folders"
+msgstr "Todas las carpetas locales"
+
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All active remote folders"
 msgstr "Todas las carpetas remotas activas"
 
-#: ../mail/mail-dialogs.ui.h:2
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local and active remote folders"
 msgstr "Todas las carpetas locales y remotas activas"
 
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All local folders"
-msgstr "Todas las carpetas locales"
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Specific folders"
+msgstr "Carpetas especÃficas"
 
-#: ../mail/mail-dialogs.ui.h:4
-msgid "Call"
-msgstr "Llamar"
+#: ../mail/mail-dialogs.ui.h:6
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+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:8
+msgid "_Flag:"
+msgstr "_Marca:"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "_Due By:"
+msgstr "_Vence el:"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Co_mpleted"
 msgstr "_Terminado"
 
-#: ../mail/mail-dialogs.ui.h:7
-msgid "Digital Signature"
-msgstr "Firma digital"
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Call"
+msgstr "Llamar"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:13
 msgid "Do Not Forward"
 msgstr "No reenviar"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "Encryption"
-msgstr "Cifrado"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Follow-Up"
 msgstr "Seguimiento"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:15
 msgid "For Your Information"
 msgstr "Para su informaciÃn"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/mail-dialogs.ui.h:13
-msgid "License Agreement"
-msgstr "Acuerdo de licencia"
-
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:17
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Review"
 msgstr "Revisar"
 
-#: ../mail/mail-dialogs.ui.h:20
-msgid "Search Folder Sources"
-msgstr "OrÃgenes de las carpetas de bÃsqueda"
-
-#: ../mail/mail-dialogs.ui.h:21
-msgid "Security Information"
-msgstr "InformaciÃn de seguridad"
-
-#: ../mail/mail-dialogs.ui.h:22
-msgid "Specific folders"
-msgstr "Carpetas especÃficas"
-
 #: ../mail/mail-dialogs.ui.h:23
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Los mensajes que ha seleccionado para seguir se listan abajo.\n"
-"Seleccione una acciÃn de seguimiento desde el menà ÂMarcarÂ."
+msgid "License Agreement"
+msgstr "Acuerdo de licencia"
+
+#: ../mail/mail-dialogs.ui.h:24
+msgid "_Tick this to accept the license agreement"
+msgstr "_Marque esto para aceptar el acuerdo de licencia"
 
 #: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "_Aceptar licencia"
 
 #: ../mail/mail-dialogs.ui.h:26
-msgid "_Due By:"
-msgstr "_Vence el:"
+msgid "Security Information"
+msgstr "InformaciÃn de seguridad"
 
 #: ../mail/mail-dialogs.ui.h:27
-msgid "_Flag:"
-msgstr "_Marca:"
+msgid "Digital Signature"
+msgstr "Firma digital"
 
 #: ../mail/mail-dialogs.ui.h:28
-msgid "_Tick this to accept the license agreement"
-msgstr "_Marque esto para aceptar el acuerdo de licencia"
+msgid "Encryption"
+msgstr "Cifrado"
 
 #: ../mail/mail.error.xml.h:1
-msgid "\"Check Junk\" Failed"
-msgstr "Fallà la comprobaciÃn de SPAM"
+msgid "Invalid authentication"
+msgstr "AutenticaciÃn no vÃlida"
 
 #: ../mail/mail.error.xml.h:2
-msgid "\"Report Junk\" Failed"
-msgstr "Fallà al informar de que es SPAM"
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+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:3
-msgid "\"Report Not Junk\" Failed"
-msgstr "Fallà al informar de que no es SPAM"
+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:4
-msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "Ya existe una carpeta llamada Â{0}Â. Use un nombre diferente."
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Verifique que su contraseÃa està escrita correctamente. Recuerde que muchas "
+"contraseÃas distinguen las mayÃsculas, su tecla de bloqueo de mayÃsculas "
+"puede estar activada."
 
 #: ../mail/mail.error.xml.h:5
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Ya existe una carpeta llamada Â{1}Â. Use un nombre diferente."
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "ÂSeguro que quiere enviar un mensaje en formato HTML?"
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
 msgstr ""
-"Ya existe una carpeta no vacÃa en Â{1}Â.\n"
-"\n"
-"Puede elegir ignorar esta carpeta, sobreescribirla o aÃadir su contenido, o "
-"salir."
+"AsegÃrese de que los siguientes destinatarios desean y son capaces de "
+"recibir correo-e en HTML:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:9
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr ""
-"Ya existe una firma con el nombre Â{0}Â. Especifique un nombre diferente."
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "ÂSeguro que quiere enviar un mensaje sin un asunto?"
 
 #: ../mail/mail.error.xml.h:10
 msgid ""
@@ -14187,553 +14196,557 @@ msgstr ""
 "destinatarios una idea de quà trata su correo."
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "ÂSeguro que quiere eliminar esta cuenta y todos sus proxies?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "ÂSeguro que quiere enviar un mensaje con sÃlo destinatarios Cco?"
 
 #: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to delete this account?"
-msgstr "ÂSeguro que quiere eliminar esta cuenta?"
-
-#: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
-msgstr ""
-"ÂSeguro que quiere desactivar esta esta cuenta y eliminar todos sus proxies?"
-
-#: ../mail/mail.error.xml.h:14
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"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 in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
-"ÂSeguro que quiere eliminar permanentemente todos los mensajes borrados en "
-"todas las carpetas?"
+"La lista de contactos que està enviando està configurada para ocultar los "
+"destinatarios de la lista.\n"
+"Muchos sistemas de correo aÃaden una cabecera Apparentely-To a los mensajes "
+"que sÃlo tienen destinatarios Cco. Esta cabecera listarà todos los "
+"destinatarios en su mensaje. Para evitar esto, deberÃa aÃadir al menos un "
+"destinatario a Para: o Cc: "
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+"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 "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
-"ÂSeguro que quiere eliminar permanentemente todos los mensajes borrados en "
-"la carpeta Â{0}Â?"
+"Muchos sistemas de correo-e aÃaden una cabecera ÂApparentely-To a los "
+"mensajes que sÃlo tienen destinatarios Cco. Esta cabecera, si se aÃade, "
+"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:16
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "ÂSeguro que quiere enviar un mensaje en formato HTML?"
-
-#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "ÂSeguro que quiere enviar un mensaje con una direcciÃn no vÃlida?"
 
-#: ../mail/mail.error.xml.h:18
-msgid "Are you sure you want to send a message with invalid addresses?"
-msgstr "ÂSeguro que quiere enviar un mensaje con direcciones no vÃlidas?"
+#: ../mail/mail.error.xml.h:17
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+"No se reconocià el siguiente destinatario como direcciÃn de correo vÃlida:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:19
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "ÂSeguro que quiere enviar un mensaje con sÃlo destinatarios Cco?"
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "ÂSeguro que quiere enviar un mensaje con direcciones no vÃlidas?"
 
 #: ../mail/mail.error.xml.h:20
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "ÂSeguro que quiere enviar un mensaje sin un asunto?"
-
-#: ../mail/mail.error.xml.h:21
-msgid "Blank Signature"
-msgstr "Firma en blanco"
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"No se reconocieron los siguientes destinatarios como direcciones de correo "
+"vÃlidas:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder \"{0}\"."
-msgstr "No se puede aÃadir la carpeta de bÃsqueda Â{0}Â."
+msgid "Send private reply?"
+msgstr "ÂEnviar una respuesta privada?"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "No se puede copiar la carpeta: Â{0}Â a Â{1}Â."
+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 "
+"you sure you want to proceed?"
+msgstr ""
+"Està respondiendo de forma privada a un correo-e que llegà a travÃs de una "
+"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:24
-msgid "Cannot create folder \"{0}\"."
-msgstr "No se puede crear la carpeta: Â{0}Â."
-
-#: ../mail/mail.error.xml.h:25
-msgid "Cannot create temporary save directory."
-msgstr "No se puede crear la carpeta de guardado temporal."
+msgid "Reply _Privately"
+msgstr "Responder pri_vadamente"
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "No se puede crear la carpeta de guardado, debido a Â{1}Â"
-
-#: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder \"{0}\"."
-msgstr "No se puede eliminar la carpeta Â{0}Â."
+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 "
+"proceed?"
+msgstr ""
+"Està respondiendo a un correo-e que llegà a travÃs de una lista de correo, "
+"pero està respondiendo de forma privada al remitente, no a la lista. ÂEstà "
+"seguro de que quiere proceder?"
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "No se puede eliminar la carpeta del sistema Â{0}Â."
+msgid "Send reply to all recipients?"
+msgstr "ÂEnviar respuesta a todos los destinatarios?"
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "No se puede editar la carpeta de bÃsqueda Â{0}Â ya que no existe."
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+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:30
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "No se puede mover la carpeta Â{0}Â a Â{1}Â."
+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:31
-msgid "Cannot open source \"{1}\"."
-msgstr "No se puede abrir el origen Â{1}Â."
+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."
+msgstr ""
+"Introduzca una direcciÃn de correo vÃlida en el campo ÂPara:Â Puede buscar "
+"direcciones de correo pulsando en el botÃn ÂPara:Â al lado de la caja de "
+"entrada."
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source \"{2}\"."
-msgstr "No se puede abrir el origen Â{2}Â."
+msgid "Use default drafts folder?"
+msgstr "ÂDesea usar la carpeta de borradores predeterminada?"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target \"{2}\"."
-msgstr "No se puede abrir el destino Â{2}Â."
-
-#: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
 msgstr ""
-"No se puede leer el archivo de licencia Â{0}Â, debido a un problema de "
-"instalaciÃn. No podrà usar este proveedor hasta que pueda aceptar esta "
-"licencia."
+"No es posible abrir la carpeta de borradores para esta cuenta. ÂQuiere usar "
+"la carpeta de borradores del sistema?"
+
+#: ../mail/mail.error.xml.h:34
+msgid "Use _Default"
+msgstr "Usar _predeterminada"
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "No se puede renombrar Â{0}Â a Â{1}Â."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
+"ÂSeguro que quiere eliminar permanentemente todos los mensajes borrados en "
+"la carpeta Â{0}Â?"
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "No se puede renombrar o mover la carpeta del sistema Â{0}Â."
+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:37
-msgid "Cannot save changes to account."
-msgstr "No se pueden guardar los cambios en la cuenta."
+msgid "_Expunge"
+msgstr "_Purgar"
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory \"{0}\"."
-msgstr "No se puede guardar en la carpeta Â{0}Â."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"ÂSeguro que quiere eliminar permanentemente todos los mensajes borrados en "
+"todas las carpetas?"
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file \"{0}\"."
-msgstr "No se puede guardar al archivo Â{0}Â."
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
+msgid "_Empty Trash"
+msgstr "_Vaciar papelera"
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script \"{0}\"."
-msgstr "No se puede establecer el script de firma Â{0}Â."
+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:41
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Verifique que su contraseÃa està escrita correctamente. Recuerde que muchas "
-"contraseÃas distinguen las mayÃsculas, su tecla de bloqueo de mayÃsculas "
-"puede estar activada."
+msgid "_Open Messages"
+msgstr "_Abrir mensajes"
 
 #: ../mail/mail.error.xml.h:42
-msgid "Close message window."
-msgstr "Cerrar la ventana de mensaje."
+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:43
-msgid "Could not save signature file."
-msgstr "No es posible guardar el archivo de firma."
-
-#: ../mail/mail.error.xml.h:45
-msgid "Do _Not Disable"
-msgstr "_No desactivar"
-
-#: ../mail/mail.error.xml.h:46
-msgid "Do _Not Synchronize"
-msgstr "_No sincronizar"
-
-#: ../mail/mail.error.xml.h:47
 msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
-"ÂQuiere sincronizar localmente las carpetas marcadas para uso en desconexiÃn?"
+"Si sale, estos mensajes no se enviarÃn hasta que Evolution sea iniciado de "
+"nuevo."
+
+#. 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:47
+msgid "Error while {0}."
+msgstr "Error mientras estaba {0}."
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do you want to mark all messages as read?"
-msgstr "ÂQuiere marcar todos los mensajes como leÃdos?"
+msgid "Error while performing operation."
+msgstr "Error al efectuar operaciÃn."
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do you wish to save your changes?"
-msgstr "ÂDesea guardar los cambios?"
-
-#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Introduzca la contraseÃa."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Error loading filter definitions."
 msgstr "Error al cargar las definiciones de filtros."
 
+#: ../mail/mail.error.xml.h:51
+msgid "Cannot save to directory \"{0}\"."
+msgstr "No se puede guardar en la carpeta Â{0}Â."
+
 #: ../mail/mail.error.xml.h:52
-msgid "Error while performing operation."
-msgstr "Error al efectuar operaciÃn."
+msgid "Cannot save to file \"{0}\"."
+msgstr "No se puede guardar al archivo Â{0}Â."
+
+#: ../mail/mail.error.xml.h:53
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "No se puede crear la carpeta de guardado, debido a Â{1}Â"
+
+#: ../mail/mail.error.xml.h:54
+msgid "Cannot create temporary save directory."
+msgstr "No se puede crear la carpeta de guardado temporal."
+
+#: ../mail/mail.error.xml.h:55
+msgid "File exists but cannot overwrite it."
+msgstr "El archivo existe pero no se puede sobreescribir."
 
-#. 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:56
-msgid "Error while {0}."
-msgstr "Error mientras estaba {0}."
+msgid "File exists but is not a regular file."
+msgstr "El archivo existe pero no es un archivo regular."
 
 #: ../mail/mail.error.xml.h:57
+msgid "Cannot delete folder \"{0}\"."
+msgstr "No se puede eliminar la carpeta Â{0}Â."
+
+#: ../mail/mail.error.xml.h:58
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "No se puede eliminar la carpeta del sistema Â{0}Â."
+
+#: ../mail/mail.error.xml.h:59
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
-"\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr ""
-"El formato de correo local de Evolution ha cambiado de mbox a maildir. Se "
-"debe migrar su correo local al formato nuevo antes de que Evolution pueda "
-"proceder ÂQuiere migrar ahora?\n"
-"\n"
-"Se crearà una cuenta mbox para preservar las antiguas carpetas mbox. Puede "
-"eliminarla despuÃs de asegurarse que sus datos se han migrado correctamente. "
-"AsegÃrese de que existe espacio suficiente si elige migrar."
+"Evolution requiere las carpetas de sistema para funcionar correctamente y no "
+"pueden renombrarse, moverse o eliminarse."
 
 #: ../mail/mail.error.xml.h:60
-msgid "Evolution's local mail format has changed."
-msgstr "El formato de correo local de Evolution ha cambiado"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "No se puede renombrar o mover la carpeta del sistema Â{0}Â."
 
 #: ../mail/mail.error.xml.h:61
-msgid "Failed to download messages for offline viewing."
-msgstr "Fallà al descargar los mensajes para trabajar sin conexiÃn"
+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:62
-msgid "Failed to find duplicate messages."
-msgstr "Fallà al buscar mensajes duplicados."
-
-#: ../mail/mail.error.xml.h:63
-msgid "Failed to open folder."
-msgstr "Fallà al abrir la carpeta."
-
-#: ../mail/mail.error.xml.h:64
 msgid ""
-"Failed to query server for a list of supported authentication mechanisms."
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
 msgstr ""
-"Fallà al consultar al servidor para la lista de mecanismos de autenticaciÃn "
-"soportados."
+"Si elimina la carpeta, todo su contenido y el de sus subcarpetas se "
+"eliminarà permanentemente."
+
+#: ../mail/mail.error.xml.h:64
+msgid "Really delete folder \"{0}\"?"
+msgstr "ÂRealmente quiere borrar la carpeta Â{0}Â?"
 
 #: ../mail/mail.error.xml.h:65
-msgid "Failed to remove attachments from messages."
-msgstr "Fallà al quitar los adjuntos de los mensajes."
+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:66
-msgid "Failed to retrieve messages."
-msgstr "FalloÌ al obtener los mensajes."
+msgid "These messages are not copies."
+msgstr "Estos mensajes no son copias."
 
 #: ../mail/mail.error.xml.h:67
-msgid "Failed to save messages to disk."
-msgstr "FalloÌ al guardar los mensajes al disco."
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"Los mensajes mostrados en las carpetas de bÃsqueda no son copias. Si los "
+"borra de la carpeta de bÃsqueda, se borrarÃn fÃsicamente de la carpeta o "
+"carpetas en las que estÃn fÃsicamente. ÂRealmente quiere borrar estos "
+"mensajes?"
 
 #: ../mail/mail.error.xml.h:68
-msgid "Failed to unsubscribe from folder."
-msgstr "Fallà al desuscribirse de la carpeta."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "No se puede renombrar Â{0}Â a Â{1}Â."
 
 #: ../mail/mail.error.xml.h:69
-msgid "File exists but cannot overwrite it."
-msgstr "El archivo existe pero no se puede sobreescribir."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Ya existe una carpeta llamada Â{1}Â. Use un nombre diferente."
 
 #: ../mail/mail.error.xml.h:70
-msgid "File exists but is not a regular file."
-msgstr "El archivo existe pero no es un archivo regular."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "No se puede mover la carpeta Â{0}Â a Â{1}Â."
+
+#: ../mail/mail.error.xml.h:71
+msgid "Cannot open source \"{2}\"."
+msgstr "No se puede abrir el origen Â{2}Â."
 
-#. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:72
-msgid "Folder '{0}' doesn't contain any duplicate message."
-msgstr "La carpeta Â{0}Â no contiene ningÃn correo duplicado."
+msgid "Cannot open target \"{2}\"."
+msgstr "No se puede abrir el destino Â{2}Â."
 
 #: ../mail/mail.error.xml.h:73
-msgid "Hidden file is attached."
-msgstr "Existe un archivo oculto adjunto."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "No se puede copiar la carpeta: Â{0}Â a Â{1}Â."
 
 #: ../mail/mail.error.xml.h:74
-msgid "If you continue, you will not be able to recover these messages."
-msgstr "Si continua, no podrà recuperar estos mensajes."
+msgid "Cannot create folder \"{0}\"."
+msgstr "No se puede crear la carpeta: Â{0}Â."
 
 #: ../mail/mail.error.xml.h:75
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
-msgstr ""
-"Si elimina la carpeta, todo su contenido y el de sus subcarpetas se "
-"eliminarà permanentemente."
+msgid "Cannot open source \"{1}\"."
+msgstr "No se puede abrir el origen Â{1}Â."
 
 #: ../mail/mail.error.xml.h:76
-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."
+msgid "Cannot save changes to account."
+msgstr "No se pueden guardar los cambios en la cuenta."
 
 #: ../mail/mail.error.xml.h:77
-msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "Si continÃa, las cuentas proxy se eliminarÃn permanentemente."
+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:78
-msgid ""
-"If you proceed, the account information and\n"
-"all proxy information will be deleted permanently."
-msgstr ""
-"Si continÃa, la informaciÃn de la cuenta y toda la\n"
-"informaciÃn del proxy se eliminarà permanentemente."
+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:79
+msgid "Are you sure you want to delete this account?"
+msgstr "ÂSeguro que quiere eliminar esta cuenta?"
 
 #: ../mail/mail.error.xml.h:80
 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:81
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"Si sale, estos mensajes no se enviarÃn hasta que Evolution sea iniciado de "
-"nuevo."
+msgid "Are you sure you want to delete this account and all its proxies?"
+msgstr "ÂSeguro que quiere eliminar esta cuenta y todos sus proxies?"
 
 #: ../mail/mail.error.xml.h:82
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: ../mail/mail.error.xml.h:83
-msgid "Invalid authentication"
-msgstr "AutenticaciÃn no vÃlida"
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+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:84
-msgid "Mail Deletion Failed"
-msgstr "Ha fallado el borrado del correo"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"ÂSeguro que quiere desactivar esta esta cuenta y eliminar todos sus proxies?"
 
 #: ../mail/mail.error.xml.h:85
-msgid "Mail filters automatically updated."
-msgstr "Filtros de correo actualizados automÃticamente."
+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:86
-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 "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"Muchos sistemas de correo-e aÃaden una cabecera ÂApparentely-To a los "
-"mensajes que sÃlo tienen destinatarios Cco. Esta cabecera, si se aÃade, "
-"listarà todos los destinatarios de su mensaje de todas formas. Para evitar "
-"esto deberÃa aÃadir al menos un destinatario ÂPara:Â o ÂCC:Â."
+msgid "Do _Not Disable"
+msgstr "_No desactivar"
 
 #: ../mail/mail.error.xml.h:87
-msgid ""
-"Messages shown in Search Folders are not copies. Deleting them from a Search "
-"Folder will delete the actual messages from the folder or folders in which "
-"they physically reside. Do you really want to delete these messages?"
-msgstr ""
-"Los mensajes mostrados en las carpetas de bÃsqueda no son copias. Si los "
-"borra de la carpeta de bÃsqueda, se borrarÃn fÃsicamente de la carpeta o "
-"carpetas en las que estÃn fÃsicamente. ÂRealmente quiere borrar estos "
-"mensajes?"
+#: ../plugins/publish-calendar/publish-calendar.c:611
+msgid "_Disable"
+msgstr "_Desactivar"
 
 #: ../mail/mail.error.xml.h:88
-msgid "Missing folder."
-msgstr "Falta la carpeta."
+msgid "Could not save signature file."
+msgstr "No es posible guardar el archivo de firma."
+
+#: ../mail/mail.error.xml.h:89
+msgid "Cannot set signature script \"{0}\"."
+msgstr "No se puede establecer el script de firma Â{0}Â."
 
 #: ../mail/mail.error.xml.h:90
-msgid "N_ever"
-msgstr "_Nunca"
+msgid "The script file must exist and be executable."
+msgstr "El archivo de script debe existir y ser ejecutable."
 
 #: ../mail/mail.error.xml.h:91
-msgid "No duplicate messages found."
-msgstr "No se encontrà ningÃn correo duplicado."
+msgid "Do you wish to save your changes?"
+msgstr "ÂDesea guardar los cambios?"
 
 #: ../mail/mail.error.xml.h:92
-msgid "No sources selected."
-msgstr "No se ha seleccionado ningÃn origen."
+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:93
-msgid "Opening too many messages at once may take a long time."
-msgstr "Abrir demasiados mensajes a la vez puede llevar mucho tiempo."
+msgid "_Discard changes"
+msgstr "_Descartar los cambios"
 
 #: ../mail/mail.error.xml.h:94
-msgid "Please check your account settings and try again."
-msgstr "Compruebe su configuraciÃn de la cuenta e intÃntelo otra vez."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "No se puede editar la carpeta de bÃsqueda Â{0}Â ya que no existe."
 
 #: ../mail/mail.error.xml.h:95
-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:96
 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."
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
-"Introduzca una direcciÃn de correo vÃlida en el campo ÂPara:Â Puede buscar "
-"direcciones de correo pulsando en el botÃn ÂPara:Â al lado de la caja de "
-"entrada."
+"Esta carpeta puede haber sido aÃadida implÃcitamente,\n"
+"vaya al editor de carpetas de bÃsqueda para aÃadirla explÃcitamente, si es "
+"necesario."
 
 #: ../mail/mail.error.xml.h:97
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}"
-msgstr ""
-"AsegÃrese de que los siguientes destinatarios desean y son capaces de "
-"recibir correo-e en HTML:\n"
-"{0}"
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "No se puede aÃadir la carpeta de bÃsqueda Â{0}Â."
+
+#: ../mail/mail.error.xml.h:98
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "Ya existe una carpeta llamada Â{0}Â. Use un nombre diferente."
 
 #: ../mail/mail.error.xml.h:99
-msgid "Please provide an unique name to identify this signature."
-msgstr "Introduzca un nombre Ãnico para identificar esta firma."
+msgid "Search Folders automatically updated."
+msgstr "Carpetas de bÃsqueda autoactualizadas."
 
 #: ../mail/mail.error.xml.h:100
-msgid "Please wait."
-msgstr "Por favor espere."
+msgid "Mail filters automatically updated."
+msgstr "Filtros de correo actualizados automÃticamente."
 
 #: ../mail/mail.error.xml.h:101
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Problema al migrar la carpeta antigua de correo Â{0}Â."
+msgid "Missing folder."
+msgstr "Falta la carpeta."
 
 #: ../mail/mail.error.xml.h:102
-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:103
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "ÂSeguro que quiere eliminar la carpeta Â{0}Â y todas sus subcarpetas?"
+msgid "You must specify a folder."
+msgstr "Debe especificar una carpeta."
 
 #: ../mail/mail.error.xml.h:104
-msgid "Really delete folder \"{0}\"?"
-msgstr "ÂRealmente quiere borrar la carpeta Â{0}Â?"
+msgid "You must name this Search Folder."
+msgstr "Debe dar un nombre a esta carpeta de bÃsqueda."
 
 #: ../mail/mail.error.xml.h:105
-msgid "Remove duplicate messages?"
-msgstr "ÂQuitar mensajes duplicados?"
+msgid "No sources selected."
+msgstr "No se ha seleccionado ningÃn origen."
 
 #: ../mail/mail.error.xml.h:106
-msgid "Reply _Privately"
-msgstr "Responder pri_vadamente"
-
-#: ../mail/mail.error.xml.h:109
-msgid "Search Folders automatically updated."
-msgstr "Carpetas de bÃsqueda autoactualizadas."
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr ""
+"Debe especificar al menos una carpeta como origen.\n"
+"HÃgalo seleccionando las carpetas individualmente, y/o seleccionando todas "
+"las carpetas locales, todas las carpetas remotas, o ambas."
 
-#: ../mail/mail.error.xml.h:110
-msgid "Send private reply?"
-msgstr "ÂEnviar una respuesta privada?"
+#: ../mail/mail.error.xml.h:108
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Problema al migrar la carpeta antigua de correo Â{0}Â."
 
-#: ../mail/mail.error.xml.h:111
-msgid "Send reply to all recipients?"
-msgstr "ÂEnviar respuesta a todos los destinatarios?"
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
+msgstr ""
+"Ya existe una carpeta no vacÃa en Â{1}Â.\n"
+"\n"
+"Puede elegir ignorar esta carpeta, sobreescribirla o aÃadir su contenido, o "
+"salir."
 
 #: ../mail/mail.error.xml.h:112
-msgid "Signature Already Exists"
-msgstr "La firma ya existe"
-
-#: ../mail/mail.error.xml.h:113
-msgid "Synchronize folders locally for offline usage?"
-msgstr "ÂSincronizar las carpetas localmente para usarse sin conexiÃn?"
+msgid "Ignore"
+msgstr "Ignorar"
 
 #: ../mail/mail.error.xml.h:114
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"Evolution requiere las carpetas de sistema para funcionar correctamente y no "
-"pueden renombrarse, moverse o eliminarse."
+msgid "_Append"
+msgstr "_Agregar"
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"The attachment named {0} is a hidden file and may contain sensitive data. "
-"Please review it before sending."
-msgstr ""
-"El adjunto de nombre {0} es un archivo oculto y puede contener datos "
-"sensibles. RevÃselo antes de enviarlo."
+msgid "Evolution's local mail format has changed."
+msgstr "El formato de correo local de Evolution ha cambiado"
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
-"The contact list you are sending to is configured to hide list recipients.\n"
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
 "\n"
-"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 in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
 msgstr ""
-"La lista de contactos que està enviando està configurada para ocultar los "
-"destinatarios de la lista.\n"
-"Muchos sistemas de correo aÃaden una cabecera Apparentely-To a los mensajes "
-"que sÃlo tienen destinatarios Cco. Esta cabecera listarà todos los "
-"destinatarios en su mensaje. Para evitar esto, deberÃa aÃadir al menos un "
-"destinatario a Para: o Cc: "
+"El formato de correo local de Evolution ha cambiado de mbox a maildir. Se "
+"debe migrar su correo local al formato nuevo antes de que Evolution pueda "
+"proceder ÂQuiere migrar ahora?\n"
+"\n"
+"Se crearà una cuenta mbox para preservar las antiguas carpetas mbox. Puede "
+"eliminarla despuÃs de asegurarse que sus datos se han migrado correctamente. "
+"AsegÃrese de que existe espacio suficiente si elige migrar."
 
 #: ../mail/mail.error.xml.h:119
-msgid ""
-"The following recipient was not recognized as a valid mail address:\n"
-"{0}"
-msgstr ""
-"No se reconocià el siguiente destinatario como direcciÃn de correo vÃlida:\n"
-"{0}"
+msgid "_Exit Evolution"
+msgstr "_Salir de Evolution"
+
+#: ../mail/mail.error.xml.h:120
+msgid "_Migrate Now"
+msgstr "_Migrar ahora"
 
 #: ../mail/mail.error.xml.h:121
+msgid "Unable to read license file."
+msgstr "No es posible leer el archivo de licencia."
+
+#: ../mail/mail.error.xml.h:122
 msgid ""
-"The following recipients were not recognized as valid mail addresses:\n"
-"{0}"
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
-"No se reconocieron los siguientes destinatarios como direcciones de correo "
-"vÃlidas:\n"
-"{0}"
+"No se puede leer el archivo de licencia Â{0}Â, debido a un problema de "
+"instalaciÃn. No podrà usar este proveedor hasta que pueda aceptar esta "
+"licencia."
+
+#: ../mail/mail.error.xml.h:123
+msgid "Please wait."
+msgstr "Por favor espere."
 
 #: ../mail/mail.error.xml.h:124
-msgid "The script file must exist and be executable."
-msgstr "El archivo de script debe existir y ser ejecutable."
+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:125
-msgid "These messages are not copies."
-msgstr "Estos mensajes no son copias."
-
-#: ../mail/mail.error.xml.h:126
 msgid ""
-"This folder may have been added implicitly,\n"
-"go to the Search Folder editor to add it explicitly, if required."
+"Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
-"Esta carpeta puede haber sido aÃadida implÃcitamente,\n"
-"vaya al editor de carpetas de bÃsqueda para aÃadirla explÃcitamente, si es "
-"necesario."
+"Fallà al consultar al servidor para la lista de mecanismos de autenticaciÃn "
+"soportados."
+
+#: ../mail/mail.error.xml.h:126
+msgid "Unable to connect to the GroupWise server."
+msgstr "No es posible conectarse con el servidor GroupWise."
+
+#: ../mail/mail.error.xml.h:127
+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:128
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
-msgstr ""
-"El mensaje no puede enviarse porque la cuenta con la que eligià enviar no "
-"està activada"
+msgid "Synchronize folders locally for offline usage?"
+msgstr "ÂSincronizar las carpetas localmente para usarse sin conexiÃn?"
 
 #: ../mail/mail.error.xml.h:129
 msgid ""
-"This message cannot be sent because you have not specified any recipients"
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
 msgstr ""
-"Este mensaje no puede enviarse porque no ha especificado ningÃn destinatario"
+"ÂQuiere sincronizar localmente las carpetas marcadas para uso en desconexiÃn?"
 
 #: ../mail/mail.error.xml.h:130
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Este servidor no soporta este tipo de autenticaciÃn requerido y quizà no "
-"soporte ningÃn tipo de autenticaciÃn."
+msgid "Do _Not Synchronize"
+msgstr "_No sincronizar"
 
 #: ../mail/mail.error.xml.h:131
-msgid "This signature has been changed, but has not been saved."
-msgstr "Esta firma ha cambiado, pero no ha sido guardada."
+msgid "_Synchronize"
+msgstr "_Sincronizar"
 
 #: ../mail/mail.error.xml.h:132
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr ""
-"Esto marcarà todos los mensajes como leÃdos en la carpeta seleccionada y sus "
-"subcarpetas."
+msgid "Do you want to mark all messages as read?"
+msgstr "ÂQuiere marcar todos los mensajes como leÃdos?"
 
 #: ../mail/mail.error.xml.h:133
 msgid "This will mark all messages as read in the selected folder."
@@ -14741,156 +14754,148 @@ msgstr ""
 "Esto marcarà todos los mensajes como leÃdos en la carpeta seleccionada."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Unable to connect to the GroupWise server."
-msgstr "No es posible conectarse con el servidor GroupWise."
-
-#: ../mail/mail.error.xml.h:135
 msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
 msgstr ""
-"No es posible abrir la carpeta de borradores para esta cuenta. ÂQuiere usar "
-"la carpeta de borradores del sistema?"
+"Esto marcarà todos los mensajes como leÃdos en la carpeta seleccionada y sus "
+"subcarpetas."
+
+#: ../mail/mail.error.xml.h:135
+msgid "Close message window."
+msgstr "Cerrar la ventana de mensaje."
 
 #: ../mail/mail.error.xml.h:136
-msgid "Unable to read license file."
-msgstr "No es posible leer el archivo de licencia."
+msgid "Would you like to close the message window?"
+msgstr "ÂQuiere seleccionar la ventana de mensaje?"
 
 #: ../mail/mail.error.xml.h:137
-msgid "Unable to retrieve message."
-msgstr "No se pudo obtener el mensaje."
+msgid "_Yes"
+msgstr "_SÃ"
 
 #: ../mail/mail.error.xml.h:138
-msgid "Use _Default"
-msgstr "Usar _predeterminada"
+msgid "_No"
+msgstr "_No"
 
 #: ../mail/mail.error.xml.h:139
-msgid "Use default drafts folder?"
-msgstr "ÂDesea usar la carpeta de borradores predeterminada?"
+msgid "_Always"
+msgstr "_Siempre"
 
 #: ../mail/mail.error.xml.h:140
-msgid "Would you like to close the message window?"
-msgstr "ÂQuiere seleccionar la ventana de mensaje?"
+msgid "N_ever"
+msgstr "_Nunca"
 
 #: ../mail/mail.error.xml.h:141
-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 "
-"you sure you want to proceed?"
-msgstr ""
-"Està respondiendo de forma privada a un correo-e que llegà a travÃs de una "
-"lista de correo, pero la lista està intentando redireccionar su respuesta de "
-"nuevo a la lista. ÂEstà seguro de que quiere proceder?"
+msgid "Signature Already Exists"
+msgstr "La firma ya existe"
 
 #: ../mail/mail.error.xml.h:142
 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 "
-"proceed?"
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr ""
-"Està respondiendo a un correo-e que llegà a travÃs de una lista de correo, "
-"pero està respondiendo de forma privada al remitente, no a la lista. ÂEstà "
-"seguro de que quiere proceder?"
+"Ya existe una firma con el nombre Â{0}Â. Especifique un nombre diferente."
 
 #: ../mail/mail.error.xml.h:143
-msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
-msgstr ""
-"Està respondiendo a un correo-e que se envià a muchos destinatarios. ÂEstà "
-"seguro de que quiere responder a TODOS ellos?"
+msgid "Blank Signature"
+msgstr "Firma en blanco"
 
 #: ../mail/mail.error.xml.h:144
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "No tiene suficientes permisos para eliminar este correo."
+msgid "Please provide an unique name to identify this signature."
+msgstr "Introduzca un nombre Ãnico para identificar esta firma."
 
 #: ../mail/mail.error.xml.h:145
-msgid "You have not filled in all of the required information."
-msgstr "No ha rellenado toda la informaciÃn requerida."
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+"El mensaje no puede enviarse porque la cuenta con la que eligià enviar no "
+"està activada"
 
 #: ../mail/mail.error.xml.h:146
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Tiene mensajes no enviados, Âquiere salir de todas formas?"
+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:147
-msgid "You may not create two accounts with the same name."
-msgstr "No puede crear dos cuentas con el mismo nombre."
+msgid "Mail Deletion Failed"
+msgstr "Ha fallado el borrado del correo"
 
 #: ../mail/mail.error.xml.h:148
-msgid "You must name this Search Folder."
-msgstr "Debe dar un nombre a esta carpeta de bÃsqueda."
+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:149
-msgid "You must specify a folder."
-msgstr "Debe especificar una carpeta."
+msgid "\"Check Junk\" Failed"
+msgstr "Fallà la comprobaciÃn de SPAM"
 
 #: ../mail/mail.error.xml.h:150
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
-msgstr ""
-"Debe especificar al menos una carpeta como origen.\n"
-"HÃgalo seleccionando las carpetas individualmente, y/o seleccionando todas "
-"las carpetas locales, todas las carpetas remotas, o ambas."
+msgid "\"Report Junk\" Failed"
+msgstr "Fallà al informar de que es SPAM"
+
+#: ../mail/mail.error.xml.h:151
+msgid "\"Report Not Junk\" Failed"
+msgstr "Fallà al informar de que no es SPAM"
 
 #: ../mail/mail.error.xml.h:152
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Su inicio de sesiÃn en su servidor Â{0}Â como Â{0}Â fallÃ."
+msgid "Remove duplicate messages?"
+msgstr "ÂQuitar mensajes duplicados?"
 
 #: ../mail/mail.error.xml.h:153
-msgid "_Always"
-msgstr "_Siempre"
-
-#: ../mail/mail.error.xml.h:154
-msgid "_Append"
-msgstr "_Agregar"
+msgid "No duplicate messages found."
+msgstr "No se encontrà ningÃn correo duplicado."
 
+#. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:155
-#: ../plugins/publish-calendar/publish-calendar.c:611
-msgid "_Disable"
-msgstr "_Desactivar"
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "La carpeta Â{0}Â no contiene ningÃn correo duplicado."
 
 #: ../mail/mail.error.xml.h:156
-msgid "_Discard changes"
-msgstr "_Descartar los cambios"
-
-#: ../mail/mail.error.xml.h:157
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
-msgid "_Empty Trash"
-msgstr "_Vaciar papelera"
+msgid "Failed to unsubscribe from folder."
+msgstr "Fallà al desuscribirse de la carpeta."
 
 #: ../mail/mail.error.xml.h:158
-msgid "_Exit Evolution"
-msgstr "_Salir de Evolution"
+msgid "Unable to retrieve message."
+msgstr "No se pudo obtener el mensaje."
 
 #: ../mail/mail.error.xml.h:159
-msgid "_Expunge"
-msgstr "_Purgar"
+msgid "{0}"
+msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
-msgid "_Migrate Now"
-msgstr "_Migrar ahora"
+msgid "Failed to open folder."
+msgstr "Fallà al abrir la carpeta."
 
 #: ../mail/mail.error.xml.h:161
-msgid "_No"
-msgstr "_No"
+msgid "Failed to find duplicate messages."
+msgstr "Fallà al buscar mensajes duplicados."
 
 #: ../mail/mail.error.xml.h:162
-msgid "_Open Messages"
-msgstr "_Abrir mensajes"
+msgid "Failed to retrieve messages."
+msgstr "FalloÌ al obtener los mensajes."
+
+#: ../mail/mail.error.xml.h:163
+msgid "Failed to remove attachments from messages."
+msgstr "Fallà al quitar los adjuntos de los mensajes."
+
+#: ../mail/mail.error.xml.h:164
+msgid "Failed to download messages for offline viewing."
+msgstr "Fallà al descargar los mensajes para trabajar sin conexiÃn"
 
 #: ../mail/mail.error.xml.h:165
-msgid "_Synchronize"
-msgstr "_Sincronizar"
+msgid "Failed to save messages to disk."
+msgstr "FalloÌ al guardar los mensajes al disco."
 
 #: ../mail/mail.error.xml.h:166
-msgid "_Yes"
-msgstr "_SÃ"
+msgid "Hidden file is attached."
+msgstr "Existe un archivo oculto adjunto."
 
 #: ../mail/mail.error.xml.h:167
-msgid "{0}"
-msgstr "{0}"
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
+msgstr ""
+"El adjunto de nombre {0} es un archivo oculto y puede contener datos "
+"sensibles. RevÃselo antes de enviarlo."
 
 #: ../mail/mail-send-recv.c:207
 msgid "Canceling..."
@@ -14998,51 +15003,51 @@ msgstr "MÃs alta"
 msgid "Highest"
 msgstr "La mÃs alta"
 
-#: ../mail/message-list.c:1906 ../widgets/table/e-cell-date.c:51
+#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1913 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1922
+#: ../mail/message-list.c:1925
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1934
+#: ../mail/message-list.c:1937
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1942
+#: ../mail/message-list.c:1945
 msgid "%b %d %l:%M %p"
 msgstr "%e de %b %l:%M %p"
 
-#: ../mail/message-list.c:1944
+#: ../mail/message-list.c:1947
 msgid "%b %d %Y"
 msgstr "%e de %b de %Y"
 
-#: ../mail/message-list.c:2743
+#: ../mail/message-list.c:2746
 msgid "Select all visible messages"
 msgstr "Selecciona todos los mensajes visibles"
 
-#: ../mail/message-list.c:2879 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2882 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Mensajes"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4092
+#: ../mail/message-list.c:4095
 msgid "Follow-up"
 msgstr "Seguimiento"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4629 ../mail/message-list.c:5049
+#: ../mail/message-list.c:4632 ../mail/message-list.c:5052
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: ../mail/message-list.c:4866
+#: ../mail/message-list.c:4869
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15050,71 +15055,71 @@ 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:4868
+#: ../mail/message-list.c:4871
 msgid "There are no messages in this folder."
 msgstr "No hay mensajes en esta carpeta."
 
-#: ../mail/message-list.etspec.h:3
-msgid "Due By"
-msgstr "Vence en"
+#: ../mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr "Marcado"
+
+#: ../mail/message-list.etspec.h:8
+msgid "Received"
+msgstr "Recibido"
 
-#: ../mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:10
+#: ../widgets/misc/e-attachment-tree-view.c:572
+msgid "Size"
+msgstr "TamaÃo"
+
+#: ../mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "Marca de estado"
 
-#: ../mail/message-list.etspec.h:5
-msgid "Flagged"
-msgstr "Marcado"
-
-#: ../mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:12
 msgid "Follow Up Flag"
 msgstr "Marca de seguimiento"
 
-#: ../mail/message-list.etspec.h:11
-msgid "Received"
-msgstr "Recibido"
+#: ../mail/message-list.etspec.h:13
+msgid "Due By"
+msgstr "Vence en"
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:18
 msgid "Sent Messages"
 msgstr "Mensajes enviados"
 
-#: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:572
-msgid "Size"
-msgstr "TamaÃo"
-
-#: ../mail/message-list.etspec.h:19
+#: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
 msgstr "Asunto recortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
-msgid "Body contains"
-msgstr "El cuerpo contiene"
+msgid "Subject or Addresses contains"
+msgstr "El asunto o las direcciones contienen"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
-msgid "Message contains"
-msgstr "El mensaje contiene"
-
-#: ../mail/searchtypes.xml.h:3
 #: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "Recipients contain"
 msgstr "El destinatario contiene"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
-msgid "Sender contains"
-msgstr "El remitente contiene"
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
+msgid "Message contains"
+msgstr "El mensaje contiene"
 
-#: ../mail/searchtypes.xml.h:5
+#: ../mail/searchtypes.xml.h:4
 #: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Subject contains"
 msgstr "El asunto contiene"
 
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
+msgid "Sender contains"
+msgstr "El remitente contiene"
+
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Addresses contains"
-msgstr "El asunto o las direcciones contienen"
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
+msgid "Body contains"
+msgstr "El cuerpo contiene"
 
 #: ../modules/addressbook/addressbook-config.c:204
 msgid ""
@@ -15187,7 +15192,7 @@ msgid "Server Information"
 msgstr "InformaciÃn del servidor"
 
 #: ../modules/addressbook/addressbook-config.c:1093
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Details"
 msgstr "Detalles"
 
@@ -15208,15 +15213,15 @@ msgstr "Propiedades de la libreta de direcciones"
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "XML EFolderList para la lista de URI de completado"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "XML EFolderList para la lista de URI de completado."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
@@ -15224,7 +15229,11 @@ msgstr ""
 "El UID de la libreta de direcciones seleccionada (o ÂprimariaÂ) en la barra "
 "lateral de la vista de ÂContactosÂ."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
+msgid "Whether to show maps in preview pane."
+msgstr "Indica si se muestran los mapas en el panel de vista previa."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
 msgid ""
 "Whether addresses should be formatted according to standard in their "
 "destination country."
@@ -15232,10 +15241,6 @@ msgstr ""
 "Indica si se deben formatear las direcciones segÃn el estÃndar del paÃs de "
 "destino."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
-msgid "Whether to show maps in preview pane."
-msgstr "Indica si se muestran los mapas en 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:194
 #: ../modules/mail/em-mailer-prefs.c:1046
@@ -15595,47 +15600,69 @@ msgstr "_Enviar un correo a la lista"
 msgid "_Send Message to Contact"
 msgstr "_Enviar un correo al contacto"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
 msgid "Anonymously"
 msgstr "AnÃnimamente"
 
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:7
-msgid "B_rowse this book until limit reached"
-msgstr "_Examinar esta libreta hasta llegar al final"
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "Using email address"
+msgstr "Usando direcciÃn de correo-e"
+
+#: ../modules/addressbook/ldap-config.ui.h:6
+msgid "Using distinguished name (DN)"
+msgstr "Usando Nombre distintivo (DN)"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:8
+msgid "One"
+msgstr "Uno"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:10
+msgid "Sub"
+msgstr "Sub"
+
+#: ../modules/addressbook/ldap-config.ui.h:11
+msgid "Supported Search Bases"
+msgstr "Bases de bÃsqueda soportadas"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Ser_ver:"
+msgstr "_Servidor:"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Use secure _connection:"
+msgstr "Usar _conexiÃn segura:"
 
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:16
+msgid "_Login method:"
+msgstr "MÃtodo de _inicio de sesiÃn:"
+
+#: ../modules/addressbook/ldap-config.ui.h:17
 msgid "Lo_gin:"
 msgstr "_Inicio de sesiÃn:"
 
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:11
-msgid "One"
-msgstr "Uno"
+#: ../modules/addressbook/ldap-config.ui.h:18
+msgid "Search _base:"
+msgstr "_Base de bÃsqueda:"
+
+#: ../modules/addressbook/ldap-config.ui.h:19
+msgid "_Search scope:"
+msgstr "Ã_mbito de bÃsqueda:"
 
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "_Find Possible Search Bases"
+msgstr "_Buscar bases de bÃsqueda posibles"
+
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "S_earch filter:"
 msgstr "_Filtro de bÃsqueda:"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Search Filter"
 msgstr "Filtro de bÃsqueda"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _base:"
-msgstr "_Base de bÃsqueda:"
-
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -15644,54 +15671,32 @@ msgstr ""
 "modifica, la bÃsqueda predeterminada se realizarà sobre la clase de objetos "
 "de tipo ÂpersonÂ."
 
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid "Ser_ver:"
-msgstr "_Servidor:"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
-msgid "Sub"
-msgstr "Sub"
-
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "Supported Search Bases"
-msgstr "Bases de bÃsqueda soportadas"
-
-#: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Use secure _connection:"
-msgstr "Usar _conexiÃn segura:"
-
-#: ../modules/addressbook/ldap-config.ui.h:23
-msgid "Using distinguished name (DN)"
-msgstr "Usando Nombre distintivo (DN)"
-
-#: ../modules/addressbook/ldap-config.ui.h:24
-msgid "Using email address"
-msgstr "Usando direcciÃn de correo-e"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:25
-msgid "_Download limit:"
-msgstr "LÃmite de _descarga:"
-
-#: ../modules/addressbook/ldap-config.ui.h:26
-msgid "_Find Possible Search Bases"
-msgstr "_Buscar bases de bÃsqueda posibles"
+msgid "1"
+msgstr "1"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Login method:"
-msgstr "MÃtodo de _inicio de sesiÃn:"
+msgid "5"
+msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
-msgid "_Search scope:"
-msgstr "Ã_mbito de bÃsqueda:"
+msgid "cards"
+msgstr "tarjetas"
 
 #: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Timeout:"
 msgstr "_Tiempo de expiraciÃn:"
 
 #: ../modules/addressbook/ldap-config.ui.h:32
-msgid "cards"
-msgstr "tarjetas"
+msgid "_Download limit:"
+msgstr "LÃmite de _descarga:"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:34
+msgid "B_rowse this book until limit reached"
+msgstr "_Examinar esta libreta hasta llegar al final"
 
 #: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
@@ -15718,73 +15723,47 @@ msgstr "Convertir el texto del correo a _Unicode"
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Color de fondo para las tareas que vencen hoy, en formato Â#rrggbbÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr ""
-"Color de fondo para las tareas que estÃn retrasadas, en formato Â#rrggbbÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid "Calendars to run reminders for"
-msgstr "Calendarios para los que ejecutar recordatorios"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Color para dibujar la lÃnea de Marcus Bains en la barra de Tiempo (vacÃa por "
-"omisiÃn)."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Color para dibujar la lÃnea de Marcus Bains en la vista diaria."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr ""
-"DÃas en los cuales debe indicarse el inicio y fin de las horas de trabajo."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Free/busy server URLs"
-msgstr "URL del servidor de disponibilidad"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
 msgstr ""
-"Hora en la que acaba la jornada laboral, en formato de veinticuatro horas, "
-"de 0 a 23."
+"El UID del calendario seleccionado (o ÂprimarioÂ) en la barra lateral de la "
+"vista de ÂCalendarioÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
-msgid "If \"true\", show the memo preview pane in the main window."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
-"Si es cierto mostrarà el panel de vista previa de notas en la ventana "
-"principal."
+"La zona horaria predeterminada que se usarà en las fechas y horas en el "
+"calendario, como una localizaciÃn sin correspondencia en una base de datos "
+"de franjas horarias Olsen, como en \"AmÃrica/Nueva York\"."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
-msgid "If \"true\", show the task preview pane in the main window."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
-"Si es cierto mostrarà el panel de vista previa de tareas en la ventana "
-"principal."
+"Usar la zona horaria del sistema en lugar de la zona horaria seleccionada en "
+"Evolution."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Intervals shown in Day and Work Week views, in minutes."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
 msgstr ""
-"Los intervalos de tiempo mostrados en las vistas diarias y semanales, en "
-"minutos."
+"Muestra la segunda zona horaria en la Vista diaria, si està establecido. El "
+"valor es similar al usado en la clave ÂtimezoneÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Lista de zonas horarias secundarias recientemente usadas en una Vista diaria."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
-msgid "List of server URLs for free/busy publishing."
-msgstr "Lista de URL del servidor para publicaciÃn de disponibilidad."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Maximum number of recently used timezones to remember."
+msgstr "MÃximo nÃmero de zonas horarias usadas recientemente para recordar."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -15792,25 +15771,31 @@ msgstr ""
 "MÃximo nÃmero de zonas horarias usadas recientemente para recordar en la "
 "lista Âday_second_zonesÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
-msgid "Maximum number of recently used timezones to remember."
-msgstr "MÃximo nÃmero de zonas horarias usadas recientemente para recordar."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+"Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
+"usar am/pm."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
-msgid "Number of units for determining a birthday or anniversary reminder."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
-"NÃmero de unidades para determinar un el recordatorio de un cumpleaÃos o "
-"aniversario."
+"El dÃa en que empieza la semana, desde el domingo (0) hasta el sÃbado (6)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-msgid "Number of units for determining a default reminder."
-msgstr "NÃmero de unidades para determinar un recordatorio predeterminado."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr ""
+"Hora en la que acaba la jornada laboral, en formato de veinticuatro horas, "
+"de 0 a 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
-msgid "Number of units for determining when to hide tasks."
-msgstr "NÃmero de unidades para determinar cuÃndo ocultar tareas."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr ""
+"Los intervalos de tiempo mostrados en las vistas diarias y semanales, en "
+"minutos."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -15818,7 +15803,20 @@ msgstr ""
 "PosiciÃn del panel horizontal, entre la vista y la fecha del navegador del "
 "calendario y lista de tareas cuando no està en la vista mensual, en pÃxeles."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Vertical pane position"
+msgstr "PosiciÃn del panel vertical"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"PosiciÃn de la hoja vertical, entre la vista y el navegador de fechas del "
+"calendario y la lista de tareas cuando no està en la vista mensual, en "
+"pÃxeles."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -15826,58 +15824,112 @@ msgstr ""
 "PosiciÃn del panel horizontal, entre la vista y el navegador de fechas del "
 "calendario y la lista de tareas en la vista de mes, en pÃxeles."
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"PosiciÃn de la hoja vertical, entre la vista y el navegador del calendario y "
+"la lista de tareas en la vista mensual, en pÃxeles."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+"PosiciÃn del panel vertical, entre las listas del calendario el calendario "
+"del navegador de fechas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"El estilo de la distribuciÃn determina dÃnde ubicar el panel de vista previa "
+"en relaciÃn con la lista de notas. Â0Â (vista clÃsica) ubica el panel de "
+"vista previa debajo de la lista de notas. Â1Â (vista vertical) ubica el panel "
+"de vista previa junto a la lista de notas."
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+"Si es cierto mostrarà el panel de vista previa de notas en la ventana "
+"principal."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+"PosiciÃn del panel de vista previa de tareas cuando està orientado "
+"horizontalmente."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 "PosiciÃn del panel de vista previa de notas cuando està orientado "
 "verticalmente."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
-msgid "Position of the task preview pane when oriented horizontally."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"El estilo de la distribuciÃn determina dÃnde ubicar el panel de vista previa "
+"en relaciÃn con la lista de tareas. Â0Â (vista clÃsica) ubica el panel de "
+"vista previa debajo de la lista de tareas. Â1Â (vista vertical) ubica el "
+"panel de vista previa junto a la lista de tareas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
-"PosiciÃn del panel de vista previa de tareas cuando està orientado "
-"horizontalmente."
+"Si es cierto mostrarà el panel de vista previa de tareas en la ventana "
+"principal."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "PosiciÃn del panel de vista previa de tareas cuando està orientado "
 "verticalmente."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
 msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
 msgstr ""
-"PosiciÃn del panel vertical, entre las listas del calendario el calendario "
-"del navegador de fechas."
+"Indica si se deben comprimir los fines de semana, lo cual pone al sÃbado y "
+"al domingo en el mismo espacio que un dÃa laborable."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
-"PosiciÃn de la hoja vertical, entre la vista y el navegador del calendario y "
-"la lista de tareas en la vista mensual, en pÃxeles."
+"Indica si debe mostrar la hora de finalizaciÃn de los acontecimientos en las "
+"vistas semanales y mensuales."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr ""
+"DÃas en los cuales debe indicarse el inicio y fin de las horas de trabajo."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
 msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
-"PosiciÃn de la hoja vertical, entre la vista y el navegador de fechas del "
-"calendario y la lista de tareas cuando no està en la vista mensual, en "
-"pÃxeles."
+"Indica si debe dibujar la lÃnea Marcus Bains (lÃnea a la hora actual) en el "
+"calendario."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
-msgid "Programs that are allowed to be run by reminders."
-msgstr "Programas que se permite que ejecuten por los recordatorios."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "Color para dibujar la lÃnea de Marcus Bains en la vista diaria."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
-msgstr "Desplazar la vista mensual una semana"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+"Color para dibujar la lÃnea de Marcus Bains en la barra de Tiempo (vacÃa por "
+"omisiÃn)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
 msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr ""
 "Mostrar los dÃas con acontecimientos que se repiten con una tipografÃa "
@@ -15885,29 +15937,13 @@ msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
 msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
-"Muestra la segunda zona horaria en la Vista diaria, si està establecido. El "
-"valor es similar al usado en la clave ÂtimezoneÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr ""
-"El UID del calendario seleccionado (o ÂprimarioÂ) en la barra lateral de la "
-"vista de ÂCalendarioÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view."
 msgstr ""
 "El UID de la nota seleccionada (o ÂprimariaÂ) en la barra lateral de la vista "
 "de ÂNotasÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view."
@@ -15915,161 +15951,130 @@ msgstr ""
 "El UID de la tarea seleccionada (o ÂprimariaÂ) en la barra lateral de la "
 "vista de ÂTareasÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"La plantilla URL para usar como datos de resguardo de disponibilidad, %u se "
-"reemplaza por la parte del usuario de la direcciÃn de correo y %d se "
-"reemplaza por el dominio."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"La zona horaria predeterminada que se usarà en las fechas y horas en el "
-"calendario, como una localizaciÃn sin correspondencia en una base de datos "
-"de franjas horarias Olsen, como en \"AmÃrica/Nueva York\"."
+"Unidades para determinar cuÃndo ocultar tareas, ÂminutesÂ, Âhours o ÂdaysÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"El estilo de la distribuciÃn determina dÃnde ubicar el panel de vista previa "
-"en relaciÃn con la lista de notas. Â0Â (vista clÃsica) ubica el panel de "
-"vista previa debajo de la lista de notas. Â1Â (vista vertical) ubica el panel "
-"de vista previa junto a la lista de notas."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:86
+msgid "Number of units for determining when to hide tasks."
+msgstr "NÃmero de unidades para determinar cuÃndo ocultar tareas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "Color de fondo para las tareas que vencen hoy, en formato Â#rrggbbÂ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr ""
-"El estilo de la distribuciÃn determina dÃnde ubicar el panel de vista previa "
-"en relaciÃn con la lista de tareas. Â0Â (vista clÃsica) ubica el panel de "
-"vista previa debajo de la lista de tareas. Â1Â (vista vertical) ubica el "
-"panel de vista previa junto a la lista de tareas."
+"Color de fondo para las tareas que estÃn retrasadas, en formato Â#rrggbbÂ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"Esto puede tener tres valores posibles. Â0Â para errores. Â1Â para avisos. Â2Â "
-"para mensajes de depuraciÃn."
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "Indica si debe pedir confirmaciÃn al eliminar una cita o tarea."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last reminder ran, in time_t."
-msgstr "La hora en que el Ãltimo recordatorio sonÃ, en time_t."
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "Indica si debe pedir confirmaciÃn al purgar citas y tareas."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Whether to set a default reminder for appointments."
 msgstr ""
-"Unidades para el recordatorio de cumpleaÃos o aniversarios, ÂminutesÂ, Âhours "
-"o ÂdaysÂ."
+"Indica si debe establecer un recordatorio predeterminado para las citas."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Number of units for determining a default reminder."
+msgstr "NÃmero de unidades para determinar un recordatorio predeterminado."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para el recordatorio predeterminado, ÂminutesÂ, Âhours o ÂdaysÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Unidades para determinar cuÃndo ocultar tareas, ÂminutesÂ, Âhours o ÂdaysÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr ""
-"Usar la zona horaria del sistema en lugar de la zona horaria seleccionada en "
-"Evolution."
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Vertical pane position"
-msgstr "PosiciÃn del panel vertical"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgid "Whether to set a reminder for birthdays and anniversaries."
 msgstr ""
-"El dÃa en que empieza la semana, desde el domingo (0) hasta el sÃbado (6)."
+"Indica si debe establecer un recordatorio para cumpleaÃos y aniversarios."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display reminders."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr ""
-"Indica si se debe usar o no la bandeja de notificaciÃn para mostrar "
-"recordatorios."
+"NÃmero de unidades para determinar un el recordatorio de un cumpleaÃos o "
+"aniversario."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Indica si debe pedir confirmaciÃn al eliminar una cita o tarea."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Indica si debe pedir confirmaciÃn al purgar citas y tareas."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
 msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"Indica si se deben comprimir los fines de semana, lo cual pone al sÃbado y "
-"al domingo en el mismo espacio que un dÃa laborable."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-msgid "Whether to display the end time of events in the week and month views."
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
 msgstr ""
-"Indica si debe mostrar la hora de finalizaciÃn de los acontecimientos en las "
-"vistas semanales y mensuales."
+"Unidades para el recordatorio de cumpleaÃos o aniversarios, ÂminutesÂ, Âhours "
+"o ÂdaysÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid "Whether to show week numbers in various places in the Calendar."
 msgstr ""
-"Indica si debe dibujar la lÃnea Marcus Bains (lÃnea a la hora actual) en el "
+"Indica si debe mostrar los nÃmeros de la semana en varias partes del "
 "calendario."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Scroll Month View by a week"
+msgstr "Desplazar la vista mensual una semana"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Indica si se debe desplazar la vista mensual una semana, no un mes."
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Time the last reminder ran, in time_t."
+msgstr "La hora en que el Ãltimo recordatorio sonÃ, en time_t."
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Whether to set a default reminder for appointments."
-msgstr ""
-"Indica si debe establecer un recordatorio predeterminado para las citas."
+msgid "Calendars to run reminders for"
+msgstr "Calendarios para los que ejecutar recordatorios"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
-msgid "Whether to set a reminder for birthdays and anniversaries."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Programas que se permite que ejecuten por los recordatorios."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether or not to use the notification tray for display reminders."
 msgstr ""
-"Indica si debe establecer un recordatorio para cumpleaÃos y aniversarios."
+"Indica si se debe usar o no la bandeja de notificaciÃn para mostrar "
+"recordatorios."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Free/busy server URLs"
+msgstr "URL del servidor de disponibilidad"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid "List of server URLs for free/busy publishing."
+msgstr "Lista de URL del servidor para publicaciÃn de disponibilidad."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+#, no-c-format
 msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
-"usar am/pm."
+"La plantilla URL para usar como datos de resguardo de disponibilidad, %u se "
+"reemplaza por la parte del usuario de la direcciÃn de correo y %d se "
+"reemplaza por el dominio."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in various places in the Calendar."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
 msgstr ""
-"Indica si debe mostrar los nÃmeros de la semana en varias partes del "
-"calendario."
+"Esto puede tener tres valores posibles. Â0Â para errores. Â1Â para avisos. Â2Â "
+"para mensajes de depuraciÃn."
 
 #: ../modules/calendar/e-cal-attachment-handler.c:312
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
 msgstr "I_mportar"
 
@@ -16101,221 +16106,221 @@ msgstr "Fecha y _hora:"
 msgid "_Date only:"
 msgstr "SÃlo _fecha:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
-#, no-c-format
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr ""
-"%u y %d se reemplazarÃn por el usuario y el dominio de la direcciÃn de "
-"correo-e."
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(Mostrado en la Vista diaria)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
-msgid "05 minutes"
-msgstr "05 minutos"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
-msgid "10 minutes"
-msgstr "10 minutos"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
-msgid "15 minutes"
-msgstr "15 minutos"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
-msgid "30 minutes"
-msgstr "30 minutos"
-
 #: ../modules/calendar/e-calendar-preferences.ui.h:8
-msgid "60 minutes"
-msgstr "60 minutos"
+msgid "Minutes"
+msgstr "Minutos"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alerts"
-msgstr "Alertas"
+msgid "Hours"
+msgstr "Horas"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Days"
+msgstr "DÃas"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
-msgid "Day _ends:"
-msgstr "La jornada _acaba a las:"
+msgid "60 minutes"
+msgstr "60 minutos"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:12
-msgid "Days"
-msgstr "DÃas"
+msgid "30 minutes"
+msgstr "30 minutos"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Default Free/Busy Server"
-msgstr "Servidor de disponibilidad predeterminado"
+msgid "15 minutes"
+msgstr "15 minutos"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
-msgid "Display"
-msgstr "Mostrar"
+msgid "10 minutes"
+msgstr "10 minutos"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:15
-msgid "Display reminders in _notification area only"
-msgstr "Mostrar recordatorios sÃlo en el Ãrea de _notificaciÃn"
+msgid "05 minutes"
+msgstr "05 minutos"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-msgid "Highlight _overdue tasks"
-msgstr "Resaltar tareas fuera de pla_zo"
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "Hora"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-msgid "Highlight t_asks due today"
-msgstr "Resaltar _tareas que vencen hoy"
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+msgid "Se_cond zone:"
+msgstr "Zona se_cundaria:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
-msgid "Hours"
-msgstr "Horas"
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+msgid "(Shown in a Day View)"
+msgstr "(Mostrado en la Vista diaria)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:21
-msgid "Minutes"
-msgstr "Minutos"
+msgid "Use s_ystem time zone"
+msgstr "Usar la zona horaria del s_istema"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Time format:"
+msgstr "Formato de la hora:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "_12 hour (AM/PM)"
+msgstr "_12 horas (AM/PM)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:24
-msgid "Publishing Information"
-msgstr "InformaciÃn de publicaciÃn"
+msgid "_24 hour"
+msgstr "_24 horas"
 
-#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Work Week"
+msgstr "Semana laboral"
+
+#. A weekday like "Monday" follows
 #: ../modules/calendar/e-calendar-preferences.ui.h:27
-msgid "S_un"
-msgstr "_Dom"
+msgid "Wee_k starts on:"
+msgstr "La sema_na empieza en:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Sc_roll Month View by a week"
-msgstr "Desplazar la vista mens_ual una semana"
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Work days:"
+msgstr "DÃas laborables:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:30
-msgid "Se_cond zone:"
-msgstr "Zona se_cundaria:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "_Day begins:"
+msgstr "La jornada laboral c_omienza a las:"
 
+#. Monday
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Select the calendars for reminder notification"
-msgstr "Seleccione los calendarios para los recordatorios de notificaciÃn"
+msgid "_Mon"
+msgstr "_Lun"
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#. Tuesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:33
-msgid "Sh_ow a reminder"
-msgstr "Mos_\ttrar un recordatorio"
+msgid "_Tue"
+msgstr "_Mar"
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:35
-msgid "Show a _reminder"
-msgstr "Mostrar un _recordatorio"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
-msgid "Show r_ecurring events in italic in bottom left calendar"
-msgstr ""
-"Mostrar acontecimientos repeti_dos en cursiva en el calendario inferior "
-"izquierdo"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "Show week _numbers"
-msgstr "Mostrar _nÃmeros de semanas"
+msgid "_Wed"
+msgstr "M_iÃ"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "T_hu"
 msgstr "_Jue"
 
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "_Fri"
+msgstr "Vi_e"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "_Sat"
+msgstr "_SÃb"
+
+#. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
-msgid "Template:"
-msgstr "Plantilla:"
+msgid "S_un"
+msgstr "_Dom"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Day _ends:"
+msgstr "La jornada _acaba a las:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
-#: ../widgets/misc/e-dateedit.c:592
-msgid "Time"
-msgstr "Hora"
+msgid "Alerts"
+msgstr "Alertas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-msgid "Time format:"
-msgstr "Formato de la hora:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "_Ask for confirmation when deleting items"
+msgstr "Pedir con_firmaciÃn al eliminar elementos"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "_Time divisions:"
+msgstr "Divisiones de _hora:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
-msgid "Use s_ystem time zone"
-msgstr "Usar la zona horaria del s_istema"
+msgid "_Show appointment end times in week and month view"
+msgstr ""
+"_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "_Compress weekends in month view"
+msgstr "_Comprimir fines de semana en la vista mensual"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Show week _numbers"
+msgstr "Mostrar _nÃmeros de semanas"
 
-#. A weekday like "Monday" follows
 #: ../modules/calendar/e-calendar-preferences.ui.h:52
-msgid "Wee_k starts on:"
-msgstr "La sema_na empieza en:"
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr ""
+"Mostrar acontecimientos repeti_dos en cursiva en el calendario inferior "
+"izquierdo"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:53
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
-msgid "Work Week"
-msgstr "Semana laboral"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
-msgid "Work days:"
-msgstr "DÃas laborables:"
+msgid "Sc_roll Month View by a week"
+msgstr "Desplazar la vista mens_ual una semana"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
-msgid "_12 hour (AM/PM)"
-msgstr "_12 horas (AM/PM)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "_24 hour"
-msgstr "_24 horas"
+msgid "Display"
+msgstr "Mostrar"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:57
-msgid "_Ask for confirmation when deleting items"
-msgstr "Pedir con_firmaciÃn al eliminar elementos"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "_Compress weekends in month view"
-msgstr "_Comprimir fines de semana en la vista mensual"
+msgid "Highlight t_asks due today"
+msgstr "Resaltar _tareas que vencen hoy"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:59
-msgid "_Day begins:"
-msgstr "La jornada laboral c_omienza a las:"
-
-#. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-msgid "_Fri"
-msgstr "Vi_e"
+msgid "Highlight _overdue tasks"
+msgstr "Resaltar tareas fuera de pla_zo"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas terminadas tras"
 
-#. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
-msgid "_Mon"
-msgstr "_Lun"
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "Display reminders in _notification area only"
+msgstr "Mostrar recordatorios sÃlo en el Ãrea de _notificaciÃn"
 
-#. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
-msgid "_Sat"
-msgstr "_SÃb"
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "Sh_ow a reminder"
+msgstr "Mos_\ttrar un recordatorio"
 
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:67
-msgid "_Show appointment end times in week and month view"
-msgstr ""
-"_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
+msgid "before every appointment"
+msgstr "antes de cada cita"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:68
-msgid "_Time divisions:"
-msgstr "Divisiones de _hora:"
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
+msgid "Show a _reminder"
+msgstr "Mostrar un _recordatorio"
 
-#. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:70
-msgid "_Tue"
-msgstr "_Mar"
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
+msgid "before every anniversary/birthday"
+msgstr "antes de cada aniversario/cumpleaÃos"
 
-#. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:72
-msgid "_Wed"
-msgstr "M_iÃ"
+msgid "Select the calendars for reminder notification"
+msgstr "Seleccione los calendarios para los recordatorios de notificaciÃn"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Default Free/Busy Server"
+msgstr "Servidor de disponibilidad predeterminado"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
 #: ../modules/calendar/e-calendar-preferences.ui.h:74
-msgid "before every anniversary/birthday"
-msgstr "antes de cada aniversario/cumpleaÃos"
+msgid "Template:"
+msgstr "Plantilla:"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
-msgid "before every appointment"
-msgstr "antes de cada cita"
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr ""
+"%u y %d se reemplazarÃn por el usuario y el dominio de la direcciÃn de "
+"correo-e."
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+msgid "Publishing Information"
+msgstr "InformaciÃn de publicaciÃn"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:123
@@ -17087,7 +17092,6 @@ msgstr "Editor de cuentas"
 
 #: ../modules/mail/e-mail-attachment-handler.c:385
 #, c-format
-#| msgid "%d attached messages"
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d mensaje adjunto"
@@ -17566,27 +17570,27 @@ msgid "_Notify Sender"
 msgstr "_Emisor de notificaciones"
 
 #: ../modules/mdn/evolution-mdn.error.xml.h:1
-msgid "Sender has been notified that you have read this message."
-msgstr "Se ha notificado al remitente de que ha leÃdo este mensaje."
-
-#: ../modules/mdn/evolution-mdn.error.xml.h:2
 msgid "Sender wants to be notified when you have read this message."
 msgstr ""
 "El remitente quiere que se le notifique cuando haya leÃdo este mensaje."
 
+#: ../modules/mdn/evolution-mdn.error.xml.h:2
+msgid "Sender has been notified that you have read this message."
+msgstr "Se ha notificado al remitente de que ha leÃdo este mensaje."
+
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Evolution is currently offline."
+msgstr "Actualmente Evolution està desconectado."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
 msgid "Click 'Work Online' to return to online mode."
 msgstr "Pulsar ÂTrabajar conectado para volver al modo conectado."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
 msgstr ""
 "Actualmente Evolution està desconectado debido a una desconexiÃn de red."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-msgid "Evolution is currently offline."
-msgstr "Actualmente Evolution està desconectado."
-
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
 "Evolution will return to online mode once a network connection is "
@@ -17653,13 +17657,13 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Probar el complemento para el cargador Python EPlugin."
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Hello Python"
-
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
 msgstr "Pruebas de carga de los complementos Python"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Hello Python"
+msgstr "Hello Python"
+
 #: ../modules/spamassassin/evolution-spamassassin.c:190
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
@@ -17744,13 +17748,13 @@ msgid "Loading accounts..."
 msgstr "Cargando cuentasâ"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Add local address books to Evolution."
-msgstr "AÃadir las libretas de direcciones locales a Evolution."
-
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Local Address Books"
 msgstr "Libretas locales de direcciones"
 
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Add local address books to Evolution."
+msgstr "AÃadir las libretas de direcciones locales a Evolution."
+
 #: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "_No mostrar otra vez este mensaje."
@@ -17761,6 +17765,10 @@ msgid "Keywords"
 msgstr "Palabras clave"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Message has no attachments"
+msgstr "El mensaje no tiene adjuntos"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -17768,10 +17776,6 @@ msgstr ""
 "Evolution ha encontrado algunas palabras clave que sugieren que este mensaje "
 "deberÃa contener un adjunto pero no puede encontrarlo."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid "Message has no attachments"
-msgstr "El mensaje no tiene adjuntos"
-
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
 msgstr "_AÃadir adjuntoâ"
@@ -17971,41 +17975,18 @@ 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
-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
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"ÂEstà seguro de que quiere restaurar Evolution desde el archivo de respaldo "
-"seleccionado?"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Back up Evolution"
-msgstr "Cerrar y respaldar Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "Close and Restore Evolution"
-msgstr "Cerrar y restaurar Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Insufficient Permissions"
-msgstr "Permisos insuficientes"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "Archivo de respaldo de Evolution no vÃlido"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 msgid "Please select a valid backup file to restore."
 msgstr "Seleccione un archivo de respaldo vÃlido que restaurar."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-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:3
+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:9
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
@@ -18013,7 +17994,18 @@ 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
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "Cerrar y respaldar Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"ÂEstà seguro de que quiere restaurar Evolution desde el archivo de respaldo "
+"seleccionado?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 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 "
@@ -18025,6 +18017,18 @@ msgstr ""
 "proceder. Esto eliminarà todos sus datos y configuraciÃn actual de Evolution "
 "y los restaurarà desde su respaldo."
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "Cerrar y restaurar Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "Permisos insuficientes"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "No se puede escribir en la carpeta seleccionada."
+
 #: ../plugins/bbdb/bbdb.c:666 ../plugins/bbdb/bbdb.c:675
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
@@ -18215,13 +18219,13 @@ msgid "Re_fresh:"
 msgstr "A_ctualizar:"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "Add CalDAV support to Evolution."
-msgstr "AÃadir soporte CalDAV a Evolution."
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV Support"
 msgstr "Soporte CalDAV"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "Add CalDAV support to Evolution."
+msgstr "AÃadir soporte CalDAV a Evolution."
+
 #: ../plugins/calendar-file/calendar-file.c:134
 msgid "_Customize options"
 msgstr "Opciones de personali_zaciÃn"
@@ -18251,25 +18255,25 @@ msgid "Force read _only"
 msgstr "Forzar _sÃlo lectura"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Add local calendars to Evolution."
-msgstr "AÃadir calendarios locales a Evolution."
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Local Calendars"
 msgstr "Calendarios locales"
 
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Add local calendars to Evolution."
+msgstr "AÃadir calendarios locales a Evolution."
+
 #: ../plugins/calendar-http/calendar-http.c:207
 msgid "Userna_me:"
 msgstr "Nombre de _usuario:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Add web calendars to Evolution."
-msgstr "AÃadir calendarios web a Evolution."
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Web Calendars"
 msgstr "Calendarios web"
 
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Add web calendars to Evolution."
+msgstr "AÃadir calendarios web a Evolution."
+
 #: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "MeteorologÃa: Niebla"
@@ -18330,29 +18334,29 @@ msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, pulgadas, etc)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Add weather calendars to Evolution."
-msgstr "AÃadir calendarios meteorolÃgicos a Evolution."
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Calendario meteorolÃgico"
 
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Add weather calendars to Evolution."
+msgstr "AÃadir calendarios meteorolÃgicos a Evolution."
+
 #: ../plugins/dbx-import/dbx-importer.c:290
 msgid "Importing Outlook Express data"
 msgstr "Importando datos de Outlook Express"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
-msgid "Import Outlook Express messages from DBX file"
-msgstr "Importar mensajes de Outlook Express desde un archivo DBX"
-
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook DBX import"
 msgstr "Importador DBX de Outlook"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Carpetas personales de Outlook Express 5/6 (.dbx)"
 
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Importar mensajes de Outlook Express desde un archivo DBX"
+
 #: ../plugins/default-source/default-source.c:169
 msgid "Mark as _default address book"
 msgstr "Marcar como libreta de direcciones pre_determinada"
@@ -18446,20 +18450,20 @@ msgstr "Clave"
 msgid "Values"
 msgstr "Valores"
 
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+msgid "Custom Header"
+msgstr "Cabecera personalizada"
+
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Add custom headers to outgoing mail messages."
 msgstr "AÃadir una cabecera personalizada a los mensajes salientes."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-msgid "Custom Header"
-msgstr "Cabecera personalizada"
-
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "Cabeceras personalizadas del correo-e"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
 "Lanzar el editor automÃticamente al pulsar una tecla en el editor de correos"
@@ -18490,14 +18494,22 @@ msgid "Use an external editor to compose plain-text mail messages."
 msgstr "Usar un editor externo para editar mensajes de correo en texto plano."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
-msgid "Cannot create Temporary File"
-msgstr "No se puede crear la carpeta de guardado temporal"
-
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "No se puede lanzar el editor"
 
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"No se puede lanzar el editor externo ajustado en las preferencias del "
+"complemento. IntÃntelo estableciendo un editor diferente."
+
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Cannot create Temporary File"
+msgstr "No se puede crear la carpeta de guardado temporal"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -18505,11 +18517,11 @@ msgstr ""
 "Evolution no puede crear un archivo temporal para guardar su correo. "
 "IntÃntelo mÃs tarde."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
 msgid "External editor still running"
 msgstr "El editor externo aÃn se està ejecutando"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
@@ -18517,14 +18529,6 @@ msgstr ""
 "El editor externo aÃn se està ejecutando. La ventana del editor de correos "
 "no se puede cerrar mientras el editor està activo."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-"No se puede lanzar el editor externo ajustado en las preferencias del "
-"complemento. IntÃntelo estableciendo un editor diferente."
-
 #: ../plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr "Seleccionar una imagen facial"
@@ -18545,7 +18549,7 @@ msgstr "Cargar una nueva imagen de _rostro"
 msgid "Include _Face"
 msgstr "Incluir _rostro"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
 msgstr "Adjuntar una imagen pequeÃa de su rostro en mensajes salientes."
 
@@ -18554,20 +18558,20 @@ msgid "Failed Read"
 msgstr "Lectura fallida"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
-msgid "Invalid Image Size"
-msgstr "TamaÃo de imagen no vÃlido"
+msgid "The file cannot be read"
+msgstr "El archivo no se puede leer"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
-msgid "Not an image"
-msgstr "No es una imagen"
+msgid "Invalid Image Size"
+msgstr "TamaÃo de imagen no vÃlido"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
 msgid "Please select an image of size 48 * 48"
 msgstr "Seleccione una imagen de tamaÃo 48 * 48"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "The file cannot be read"
-msgstr "El archivo no se puede leer"
+msgid "Not an image"
+msgstr "No es una imagen"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
@@ -18610,13 +18614,13 @@ msgid "Retrieve _List"
 msgstr "Obtener _lista"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Add Google Calendars to Evolution."
-msgstr "AÃadir un calendario de Google a Evolution."
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google Calendars"
 msgstr "Calendarios de Google"
 
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Add Google Calendars to Evolution."
+msgstr "AÃadir un calendario de Google a Evolution."
+
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Imagen en lÃnea"
@@ -18626,30 +18630,16 @@ msgid "View image attachments directly in mail messages."
 msgstr "Ver los adjuntos directamente en los mensajes de correo."
 
 #: ../plugins/imap-features/imap-headers.c:334
-#: ../plugins/imap-features/imap-headers.ui.h:2
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "Custom Headers"
 msgstr "Cabeceras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:346
-#: ../plugins/imap-features/imap-headers.ui.h:5
-msgid "IMAP Headers"
-msgstr "Cabeceras IMAP"
-
-#: ../plugins/imap-features/imap-headers.ui.h:1
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr "Cabeceras bÃsicas y de _listas de correo predeterminadas"
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-"Proporcione las cabeceras extra que necesite obtener ademÃs de las cabeceras "
-"estÃndar anteriores.\n"
-"Puede ignorar esto si elige ÂTodas las cabecerasÂ"
+#: ../plugins/imap-features/imap-headers.c:346
+#: ../plugins/imap-features/imap-headers.ui.h:7
+msgid "IMAP Headers"
+msgstr "Cabeceras IMAP"
 
-#: ../plugins/imap-features/imap-headers.ui.h:6
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18657,7 +18647,11 @@ msgstr ""
 "Seleccione sus preferencias para las cabeceras IMAP. \n"
 "Cuantas mÃs cabeceras tenga mÃs tiempo se tardarà en descargar."
 
-#: ../plugins/imap-features/imap-headers.ui.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:3
+msgid "_Fetch All Headers"
+msgstr "Obtener _todas las cabeceras"
+
+#: ../plugins/imap-features/imap-headers.ui.h:4
 msgid ""
 "_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18665,18 +18659,28 @@ msgstr ""
 "Cabeceras _bÃsicas - (rÃpido) \n"
 "Use esto si no tiene filtros basados en listas de correo"
 
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "_Fetch All Headers"
-msgstr "Obtener _todas las cabeceras"
+#: ../plugins/imap-features/imap-headers.ui.h:6
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr "Cabeceras bÃsicas y de _listas de correo predeterminadas"
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "Fine-tune your IMAP accounts."
-msgstr "Configurar sus cuentas IMAP."
+#: ../plugins/imap-features/imap-headers.ui.h:8
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+"Proporcione las cabeceras extra que necesite obtener ademÃs de las cabeceras "
+"estÃndar anteriores.\n"
+"Puede ignorar esto si elige ÂTodas las cabecerasÂ"
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "IMAP Features"
 msgstr "CaracterÃsticas IMAP"
 
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "Fine-tune your IMAP accounts."
+msgstr "Configurar sus cuentas IMAP."
+
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
 #: ../plugins/itip-formatter/itip-formatter.c:505
@@ -19391,25 +19395,25 @@ msgid "_Memos:"
 msgstr "_Notas:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Mostrar las partes MIME de texto/calendario en los mensajes."
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
 msgstr "Formateador iTip"
 
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Mostrar las partes MIME de texto/calendario en los mensajes."
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
-msgstr "Â{0}Â ha delegado la reuniÃn. ÂQuiere aÃadir al delegado Â{1}Â?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Esta respuesta no es de un asistente. ÂDesea aÃadirlo como asistente?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "Esta reuniÃn se ha delegado"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "Esta respuesta no es de un asistente. ÂDesea aÃadirlo como asistente?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "Â{0}Â ha delegado la reuniÃn. ÂQuiere aÃadir al delegado Â{1}Â?"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:350
 msgid "Get List _Archive"
@@ -19482,31 +19486,17 @@ msgstr "AcciÃn no disponible"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
-"\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"This message does not contain the header information required for this "
+"action."
 msgstr ""
-"Se enviarà un mensaje de correo-e a la URL Â{0}Â. Puede enviar el mensaje "
-"automÃticamente , o verlo y cambiarlo primero.\n"
-"\n"
-"DeberÃa recibir una respuesta desde la lista de correo al poco tiempo "
-"despuÃs de que este mensaje sea enviado."
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
-msgid "Malformed header"
-msgstr "Cabecera mal formada"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-msgid "No e-mail action"
-msgstr "Sin acciÃn de correo-e"
+"Este mensaje no contiene la informaciÃn de cabecera requerida para esta "
+"acciÃn."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
 msgid "Posting not allowed"
 msgstr "PublicaciÃn no permitida"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
@@ -19515,23 +19505,37 @@ msgstr ""
 "lista de correo de sÃlo lectura. contacte con el responsable de la lista "
 "para mÃs detalles."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Send e-mail message to mailing list?"
 msgstr "ÂDesea enviar un mensaje a la lista de correo?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"Header: {0}"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"La acciÃn no se pudo realizar. La cabecera para esta acciÃn no contenÃa "
-"ninguna acciÃn que se pudiese procesar.\n"
+"Se enviarà un mensaje de correo-e a la URL Â{0}Â. Puede enviar el mensaje "
+"automÃticamente , o verlo y cambiarlo primero.\n"
 "\n"
-"Cabecera: {0}"
+"DeberÃa recibir una respuesta desde la lista de correo al poco tiempo "
+"despuÃs de que este mensaje sea enviado."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "_Send message"
+msgstr "_Enviar mensaje"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid "_Edit message"
+msgstr "_Editar mensaje"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
+msgid "Malformed header"
+msgstr "Cabecera mal formada"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
@@ -19541,21 +19545,21 @@ msgstr ""
 "\n"
 "Cabecera: {1}"
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
+msgid "No e-mail action"
+msgstr "Sin acciÃn de correo-e"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"This message does not contain the header information required for this "
-"action."
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
+"\n"
+"Header: {0}"
 msgstr ""
-"Este mensaje no contiene la informaciÃn de cabecera requerida para esta "
-"acciÃn."
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
-msgid "_Edit message"
-msgstr "_Editar mensaje"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
-msgid "_Send message"
-msgstr "_Enviar mensaje"
+"La acciÃn no se pudo realizar. La cabecera para esta acciÃn no contenÃa "
+"ninguna acciÃn que se pudiese procesar.\n"
+"\n"
+"Cabecera: {0}"
 
 #: ../plugins/mail-notification/mail-notification.c:384
 #, c-format
@@ -19818,15 +19822,15 @@ 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/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "Preferir texto plano"
+
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
 msgid "Plain Text Mode"
 msgstr "Modo de texto sin formato"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Prefer Plain Text"
-msgstr "Preferir texto plano"
-
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
 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."
@@ -19872,17 +19876,17 @@ msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
-msgid "Import Outlook messages from PST file"
-msgstr "Importar mensajes de Outlook desde un archivo PST"
-
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook PST import"
 msgstr "Importador PST de Outlook"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook personal folders (.pst)"
 msgstr "Carpetas personales de Outlook (.pst)"
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Import Outlook messages from PST file"
+msgstr "Importar mensajes de Outlook desde un archivo PST"
+
 #: ../plugins/pst-import/pst-importer.c:543
 msgid "_Mail"
 msgstr "Co_rreo"
@@ -19899,7 +19903,7 @@ msgstr "Libreta de _direcciones"
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
-#: ../plugins/pst-import/pst-importer.c:583 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:583 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Tareas"
 
@@ -19953,7 +19957,7 @@ msgid "Mount of %s failed:"
 msgstr "Fallà al montar %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:611
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "_Activar"
 
@@ -19972,93 +19976,93 @@ msgstr "No se pudo publicar el hilo de publicaciÃn."
 msgid "_Publish Calendar Information"
 msgstr "_Publicar informaciÃn del calendario"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Custom Location"
-msgstr "UbicaciÃn personalizado"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+msgid "iCal"
+msgstr "iCal"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
 msgstr "Diariamente"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
-msgid "FTP (with login)"
-msgstr "FTP (con registro)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "Weekly"
+msgstr "Semanalmente"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
 msgstr "Manual (por medio del menà Acciones)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
-msgid "P_ort:"
-msgstr "_Puerto:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Secure FTP (SFTP)"
+msgstr "FTP seguro (SFTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Public FTP"
 msgstr "FTP pÃblico"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
-msgid "Publishing Location"
-msgstr "Lugar de publicaciÃn"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "FTP (with login)"
+msgstr "FTP (con registro)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
-msgid "Publishing _Frequency:"
-msgstr "_Frecuencia de publicaciÃn:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Windows share"
+msgstr "ComparticiÃn Windows"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SFTP)"
-msgstr "FTP seguro (SFTP)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Secure WebDAV (HTTPS)"
 msgstr "WebDAV serguro (HTTPS)"
 
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Custom Location"
+msgstr "UbicaciÃn personalizado"
+
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
-msgid "Service _type:"
-msgstr "_Tipo de servicio:"
+msgid "_Publish as:"
+msgstr "_Publicar como:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
-msgid "Sources"
-msgstr "OrÃgenes"
+msgid "Publishing _Frequency:"
+msgstr "_Frecuencia de publicaciÃn:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "_DuraciÃn:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
-msgid "WebDAV (HTTP)"
-msgstr "WebDAV (HTTP)"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Weekly"
-msgstr "Semanalmente"
+msgid "Sources"
+msgstr "OrÃgenes"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-msgid "Windows share"
-msgstr "ComparticiÃn Windows"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+msgid "Service _type:"
+msgstr "_Tipo de servicio:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
 msgstr "_Archivo:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "P_ort:"
+msgstr "_Puerto:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Username:"
+msgstr "_Usuario:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Password:"
 msgstr "_ContraseÃa:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "_Publish as:"
-msgstr "_Publicar como:"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "_Remember password"
 msgstr "_Recordar contraseÃa"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Username:"
-msgstr "_Usuario:"
-
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
-msgid "iCal"
-msgstr "iCal"
+msgid "Publishing Location"
+msgstr "Lugar de publicaciÃn"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:94
 #: ../plugins/publish-calendar/publish-format-ical.c:91
@@ -20199,7 +20203,7 @@ 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/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
@@ -20222,14 +20226,14 @@ msgid "Save as Template"
 msgstr "Guardar como plantilla"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "TNEF Decoder"
+msgstr "Decodificador TNEF"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
 msgstr ""
 "Decodificar adjuntos TNEF (.dat de correo de Windows) de Microsoft Outlook."
 
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Decoder"
-msgstr "Decodificador TNEF"
-
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
 msgid "Inline vCards"
 msgstr "vCards en lÃnea"
@@ -20263,13 +20267,13 @@ msgid "Save in Address Book"
 msgstr "Guardar en la libreta de direcciones"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "Add WebDAV contacts to Evolution."
-msgstr "AÃadir contactos WebDAV a Evolution."
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "Contactos WebDAV"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "Add WebDAV contacts to Evolution."
+msgstr "AÃadir contactos WebDAV a Evolution."
+
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
@@ -20282,104 +20286,58 @@ msgstr "URL:"
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Evitar IfMatch (necesario en Apache < 2.2.8)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "Authenticate proxy server connections"
-msgstr "Autenticar las conexiones del servidor proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Automatic proxy configuration URL"
-msgstr "URL para la configuraciÃn automÃtica del proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Default window X coordinate"
-msgstr "Coordenada X predeterminada de la ventana"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
-msgid "Default window Y coordinate"
-msgstr "Coordenada Y predeterminada de la ventana"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:7
-msgid "Default window height"
-msgstr "Altura predeterminada de la ventana"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Default window state"
-msgstr "Estado predeterminado de la ventana"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid "Default window width"
-msgstr "Anchura predeterminada de la ventana"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
-"Activa los ajustes del proxy al acceder a HTTP/Secure HTTP en Internet."
+"Lista de rutas a las carpetas que se sincronizarÃn al disco para usar "
+"desconectado"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Default window Y coordinate"
+msgstr "Coordenada Y predeterminada de la ventana"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "HTTP proxy host name"
-msgstr "Nombre del servidor proxy HTtP"
+msgid "The default Y coordinate for the main window."
+msgstr "La coordenada Y predeterminada para la ventana principal."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "HTTP proxy password"
-msgstr "ContraseÃa del proxy HTTP"
+msgid "Default window X coordinate"
+msgstr "Coordenada X predeterminada de la ventana"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "HTTP proxy port"
-msgstr "Puerto del proxy HTTP"
+msgid "The default X coordinate for the main window."
+msgstr "La coordenada X predeterminada para la ventana principal."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "HTTP proxy username"
-msgstr "Usuario del proxy HTTP"
+msgid "Default window width"
+msgstr "Anchura predeterminada de la ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "The default width for the main window, in pixels."
+msgstr "La anchura predeterminada de la ventana principal, en pÃxeles."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"Si està activada entonces las conexiones con el proxy requerirÃn "
-"autenticaciÃn. El usuario se obtiene de la clave de GConf \"/apps/evolution/"
-"shell/network_config/authentication_user\" y la contraseÃa de gnome-keyring "
-"o bien del archivo de contrasÃeas ~/.gnome2_private/Evolution."
+msgid "Default window height"
+msgstr "Altura predeterminada de la ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"Lista de rutas a las carpetas que se sincronizarÃn al disco para usar "
-"desconectado"
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "The default height for the main window, in pixels."
+msgstr "Altura predeterminada de la ventana principal, en pÃxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
-msgid "Non-proxy hosts"
-msgstr "Servidores que no sean proxy"
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Default window state"
+msgstr "Estado predeterminado de la ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "ContraseÃa para pasar como autenticaciÃn al hacer HTTP proxy."
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Whether or not the window should be maximized."
+msgstr "Indica si la ventana debe o no maximizarse."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "Proxy configuration mode"
 msgstr "Modo de configuraciÃn del proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
-msgid "SOCKS proxy host name"
-msgstr "Nombre del servidor proxy SOCKS"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:27
-msgid "SOCKS proxy port"
-msgstr "Puerto del proxy SOCKS"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Secure HTTP proxy host name"
-msgstr "Nombre del servidor proxy HTTP seguro"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Secure HTTP proxy port"
-msgstr "Puerto del proxy HTTP seguro"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20391,35 +20349,11 @@ msgstr ""
 "\"usar configuraciÃn manual del proxy\" y \"usar la configuraciÃn "
 "proporcionada en la URL de autoconfiguraciÃn del proxy\" respectivamente."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid "The default X coordinate for the main window."
-msgstr "La coordenada X predeterminada para la ventana principal."
-
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "The default Y coordinate for the main window."
-msgstr "La coordenada Y predeterminada para la ventana principal."
+msgid "HTTP proxy port"
+msgstr "Puerto del proxy HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid "The default height for the main window, in pixels."
-msgstr "Altura predeterminada de la ventana principal, en pÃxeles."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "The default width for the main window, in pixels."
-msgstr "La anchura predeterminada de la ventana principal, en pÃxeles."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid "The machine name to proxy HTTP through."
-msgstr "El nombre de la mÃquina por la que se hace proxy HTTP."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "The machine name to proxy secure HTTP through."
-msgstr "El nombre de la mÃquina por la que se hace proxy HTTP seguro."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy socks through."
-msgstr "El nombre de la mÃquina por la que se hace proxy socks."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20427,7 +20361,19 @@ msgstr ""
 "El puerto de la mÃquina definida por \"/apps/evolution/shell/network_config/"
 "http_host\" que hace de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid "HTTP proxy host name"
+msgstr "Nombre del servidor proxy HTtP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid "The machine name to proxy HTTP through."
+msgstr "El nombre de la mÃquina por la que se hace proxy HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid "Secure HTTP proxy port"
+msgstr "Puerto del proxy HTTP seguro"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20435,7 +20381,19 @@ msgstr ""
 "El puerto de la mÃquina definida por \"/apps/evolution/shell/network_config/"
 "secure_host\" que hace de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "Secure HTTP proxy host name"
+msgstr "Nombre del servidor proxy HTTP seguro"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "The machine name to proxy secure HTTP through."
+msgstr "El nombre de la mÃquina por la que se hace proxy HTTP seguro."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "SOCKS proxy port"
+msgstr "Puerto del proxy SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20443,7 +20401,61 @@ msgstr ""
 "El puerto de la mÃquina definida por \"/apps/evolution/shell/network_config/"
 "socks_host\" que hace de proxy."
 
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "SOCKS proxy host name"
+msgstr "Nombre del servidor proxy SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "The machine name to proxy socks through."
+msgstr "El nombre de la mÃquina por la que se hace proxy socks."
+
 #: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "Use HTTP proxy"
+msgstr "Usar proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Activa los ajustes del proxy al acceder a HTTP/Secure HTTP en Internet."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid "Authenticate proxy server connections"
+msgstr "Autenticar las conexiones del servidor proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:52
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+"Si està activada entonces las conexiones con el proxy requerirÃn "
+"autenticaciÃn. El usuario se obtiene de la clave de GConf \"/apps/evolution/"
+"shell/network_config/authentication_user\" y la contraseÃa de gnome-keyring "
+"o bien del archivo de contrasÃeas ~/.gnome2_private/Evolution."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:53
+msgid "HTTP proxy username"
+msgstr "Usuario del proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:54
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr "Nombre de usuario que pasar como autenticaciÃn al usar el proxy HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "HTTP proxy password"
+msgstr "ContraseÃa del proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:56
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "ContraseÃa para pasar como autenticaciÃn al hacer HTTP proxy."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:57
+msgid "Non-proxy hosts"
+msgstr "Servidores que no sean proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20456,22 +20468,14 @@ msgstr ""
 "foo.com), direcciones IP de servidores (tanto IPv4 como IPv6) y direcciones "
 "de red con una mÃscara (algo como 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:59
+msgid "Automatic proxy configuration URL"
+msgstr "URL para la configuraciÃn automÃtica del proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "URL that provides proxy configuration values."
 msgstr "URL que proporciona las variables de configuraciÃn del proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid "Use HTTP proxy"
-msgstr "Usar proxy HTTP"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:53
-msgid "Username to pass as authentication when doing HTTP proxying."
-msgstr "Nombre de usuario que pasar como autenticaciÃn al usar el proxy HTTP."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether or not the window should be maximized."
-msgstr "Indica si la ventana debe o no maximizarse."
-
 #: ../shell/e-shell.c:312
 msgid "Preparing to go offline..."
 msgstr "PreparÃndose para desconectarseâ"
@@ -20941,19 +20945,34 @@ msgstr ""
 "%s: --force-online y --offline no se pueden usar a la vez.\n"
 "  Ejecute Â%s --help para obtener mÃs informaciÃn\n"
 
-#: ../shell/shell.error.xml.h:1
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "ÂSeguro que quiere olvidar todas las contraseÃas almacenadas?"
+#: ../shell/shell.error.xml.h:2
+msgid "Upgrade from previous version failed:"
+msgstr "Fallà la actualizaciÃn desde la versiÃn anterior:"
+
+#: ../shell/shell.error.xml.h:3
+msgid ""
+"{0}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{0}\n"
+"\n"
+"Si elige continuar, quizà no tenga acceso a algunos de sus datos antiguos.\n"
+
+#: ../shell/shell.error.xml.h:7
+msgid "Continue Anyway"
+msgstr "Continuar de todas formas"
+
+#: ../shell/shell.error.xml.h:8
+msgid "Quit Now"
+msgstr "Salir ahora"
 
-#: ../shell/shell.error.xml.h:2
+#: ../shell/shell.error.xml.h:9
 msgid "Cannot upgrade directly from version {0}"
 msgstr "No se puede actualizar directamente desde la versiÃn {0}"
 
-#: ../shell/shell.error.xml.h:3
-msgid "Continue Anyway"
-msgstr "Continuar de todas formas"
-
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "Evolution no longer supports upgrading directly from version {0}. However as "
 "a workaround you might try first upgrading to Evolution 2, and then "
@@ -20963,7 +20982,11 @@ msgstr ""
 "obstante, como soluciÃn puede intentar actualizar primero a Evolution 2 y "
 "despuÃs a Evolution 3."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:11
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr "ÂSeguro que quiere olvidar todas las contraseÃas almacenadas?"
+
+#: ../shell/shell.error.xml.h:12
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20971,29 +20994,10 @@ msgstr ""
 "Olvidar sus contraseÃas eliminarà todas las contraseÃas recordadas. Se le "
 "volverà a preguntar la prÃxima vez que se necesiten."
 
-#: ../shell/shell.error.xml.h:7
-msgid "Quit Now"
-msgstr "Salir ahora"
-
-#: ../shell/shell.error.xml.h:8
-msgid "Upgrade from previous version failed:"
-msgstr "Fallà la actualizaciÃn desde la versiÃn anterior:"
-
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:13
 msgid "_Forget"
 msgstr "_Olvidar"
 
-#: ../shell/shell.error.xml.h:10
-msgid ""
-"{0}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-msgstr ""
-"{0}\n"
-"\n"
-"Si elige continuar, quizà no tenga acceso a algunos de sus datos antiguos.\n"
-
 #: ../shell/test/e-test-shell-backend.c:52
 msgctxt "New"
 msgid "_Test Item"
@@ -21101,7 +21105,7 @@ msgid "Issued To Organizational Unit"
 msgstr "Expedido a la unidad organizativa (OU)"
 
 #: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:12
 #: ../smime/lib/e-cert.c:565
 msgid "Serial Number"
 msgstr "NÃmero de serie"
@@ -21112,7 +21116,7 @@ msgid "Purposes"
 msgstr "PropÃsito"
 
 #: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:15
 msgid "Issued By"
 msgstr "Emitido por"
 
@@ -21141,13 +21145,13 @@ msgstr "Caduca"
 
 #: ../smime/gui/certificate-manager.c:83
 #: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:17
 msgid "SHA1 Fingerprint"
 msgstr "Huella SHA1"
 
 #: ../smime/gui/certificate-manager.c:84
 #: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:18
 msgid "MD5 Fingerprint"
 msgstr "Huella MD5"
 
@@ -21242,159 +21246,159 @@ msgstr ""
 msgid "Select certificate"
 msgstr "Seleccione el certificado"
 
-#: ../smime/gui/smime-ui.ui.h:1
-msgid "<Not Part of Certificate>"
-msgstr "<No es parte del certificado>"
-
-#: ../smime/gui/smime-ui.ui.h:2
-msgid "Authorities"
-msgstr "Autoridades"
-
-#: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup _All"
-msgstr "Respaldar _todo"
+#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:825
+msgid "SSL Client Certificate"
+msgstr "Certificado de cliente SSL"
 
-#: ../smime/gui/smime-ui.ui.h:4
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Antes de confiar en esta AC para cualquier propÃsito, deberÃa examinar su "
-"certificado y su directiva y procedimientos (si estÃn disponibles)."
+#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:829
+msgid "SSL Server Certificate"
+msgstr "Certificado de servidor SSL"
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1093
-msgid "Certificate"
-msgstr "Certificado"
+#: ../smime/gui/smime-ui.ui.h:5
+msgid "Email Signer Certificate"
+msgstr "Certificado del firmante del correo-e"
 
 #: ../smime/gui/smime-ui.ui.h:6
-msgid "Certificate Authority Trust"
-msgstr "Confianza en la autoridad certificadora"
+msgid "Email Recipient Certificate"
+msgstr "Certificado del destinatario del correo-e"
 
 #: ../smime/gui/smime-ui.ui.h:7
-msgid "Certificate Fields"
-msgstr "Campos del certificado"
+msgid "This certificate has been verified for the following uses:"
+msgstr "Este certificado ha sido verificado para los siguientes usos:"
 
 #: ../smime/gui/smime-ui.ui.h:8
-msgid "Certificate Hierarchy"
-msgstr "JerarquÃa del certificado"
+msgid "Issued To"
+msgstr "Emitido a"
 
 #: ../smime/gui/smime-ui.ui.h:9
-msgid "Certificate details"
-msgstr "Detalles del certificado"
+msgid "Common Name (CN)"
+msgstr "Nombre comÃn (CN)"
 
 #: ../smime/gui/smime-ui.ui.h:10
-msgid "Certificates Table"
-msgstr "Tabla de certificados"
+msgid "Organization (O)"
+msgstr "OrganizaciÃn (O)"
 
 #: ../smime/gui/smime-ui.ui.h:11
-msgid "Common Name (CN)"
-msgstr "Nombre comÃn (CN)"
+msgid "Organizational Unit (OU)"
+msgstr "Unidad organizativa (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:12
-msgid "Contact Certificates"
-msgstr "Certificados de contactos"
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "Issued On"
+msgstr "Emitido el"
 
 #: ../smime/gui/smime-ui.ui.h:14
-msgid "Do not trust the authenticity of this certificate"
-msgstr "No confiar en la autenticidad de este certificado"
-
-#: ../smime/gui/smime-ui.ui.h:15
-msgid "Email Certificate Trust Settings"
-msgstr "Ajustes de confianza de certificados de correo-e"
-
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Email Recipient Certificate"
-msgstr "Certificado del destinatario del correo-e"
-
-#: ../smime/gui/smime-ui.ui.h:17
-msgid "Email Signer Certificate"
-msgstr "Certificado del firmante del correo-e"
-
-#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Caduca el"
 
+#: ../smime/gui/smime-ui.ui.h:16
+msgid "Fingerprints"
+msgstr "Huellas"
+
 #: ../smime/gui/smime-ui.ui.h:19
-msgid "Field Value"
-msgstr "Valor del campo"
+msgid "<Not Part of Certificate>"
+msgstr "<No es parte del certificado>"
 
 #: ../smime/gui/smime-ui.ui.h:20
-msgid "Fingerprints"
-msgstr "Huellas"
+msgid "Validity"
+msgstr "Validez"
+
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Certificate Hierarchy"
+msgstr "JerarquÃa del certificado"
+
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "Certificate Fields"
+msgstr "Campos del certificado"
 
 #: ../smime/gui/smime-ui.ui.h:24
-msgid "Issued On"
-msgstr "Emitido el"
+msgid "Field Value"
+msgstr "Valor del campo"
 
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Issued To"
-msgstr "Emitido a"
+#: ../smime/gui/smime-ui.ui.h:26
+msgid "You have certificates from these organizations that identify you:"
+msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
 #: ../smime/gui/smime-ui.ui.h:27
-msgid "Organization (O)"
-msgstr "OrganizaciÃn (O)"
-
-#: ../smime/gui/smime-ui.ui.h:28
-msgid "Organizational Unit (OU)"
-msgstr "Unidad organizativa (OU)"
+msgid "Certificates Table"
+msgstr "Tabla de certificados"
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:825
-msgid "SSL Client Certificate"
-msgstr "Certificado de cliente SSL"
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:30
+msgid "_Backup"
+msgstr "_Respaldo"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:829
-msgid "SSL Server Certificate"
-msgstr "Certificado de servidor SSL"
+#: ../smime/gui/smime-ui.ui.h:31
+msgid "Backup _All"
+msgstr "Respaldar _todo"
 
 #: ../smime/gui/smime-ui.ui.h:33
-msgid "This certificate has been verified for the following uses:"
-msgstr "Este certificado ha sido verificado para los siguientes usos:"
+msgid "Your Certificates"
+msgstr "Sus certificados"
 
 #: ../smime/gui/smime-ui.ui.h:34
-msgid "Trust the authenticity of this certificate"
-msgstr "Confiar en la autenticidad de este certificado"
+msgid "You have certificates on file that identify these people:"
+msgstr "Tiene archivados los certificados que identifican a estas personas:"
 
 #: ../smime/gui/smime-ui.ui.h:35
-msgid "Trust this CA to identify _email users."
-msgstr "Confiar en esta AC para identificar a usuarios de _correo-e."
+msgid "Contact Certificates"
+msgstr "Certificados de contactos"
 
 #: ../smime/gui/smime-ui.ui.h:36
-msgid "Trust this CA to identify _software developers."
-msgstr "Confiar en esta AC para identificar a desarrolladores de _software."
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
+"Tiene archivados los certificados que identifican a estas autoridades de "
+"certificaciÃn:"
 
 #: ../smime/gui/smime-ui.ui.h:37
-msgid "Trust this CA to identify _websites."
-msgstr "Confiar en esta AC para identificar sitios _web."
+msgid "Authorities"
+msgstr "Autoridades"
 
 #: ../smime/gui/smime-ui.ui.h:38
-msgid "Validity"
-msgstr "Validez"
+msgid "Certificate Authority Trust"
+msgstr "Confianza en la autoridad certificadora"
 
 #: ../smime/gui/smime-ui.ui.h:39
-msgid "You have certificates from these organizations that identify you:"
-msgstr "Tiene certificados de estas organizaciones que le identifican:"
+msgid "Trust this CA to identify _websites."
+msgstr "Confiar en esta AC para identificar sitios _web."
 
 #: ../smime/gui/smime-ui.ui.h:40
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"Tiene archivados los certificados que identifican a estas autoridades de "
-"certificaciÃn:"
+msgid "Trust this CA to identify _email users."
+msgstr "Confiar en esta AC para identificar a usuarios de _correo-e."
 
 #: ../smime/gui/smime-ui.ui.h:41
-msgid "You have certificates on file that identify these people:"
-msgstr "Tiene archivados los certificados que identifican a estas personas:"
+msgid "Trust this CA to identify _software developers."
+msgstr "Confiar en esta AC para identificar a desarrolladores de _software."
 
 #: ../smime/gui/smime-ui.ui.h:42
-msgid "Your Certificates"
-msgstr "Sus certificados"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Antes de confiar en esta AC para cualquier propÃsito, deberÃa examinar su "
+"certificado y su directiva y procedimientos (si estÃn disponibles)."
 
-#. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:44
-msgid "_Backup"
-msgstr "_Respaldo"
+#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1093
+msgid "Certificate"
+msgstr "Certificado"
 
 #: ../smime/gui/smime-ui.ui.h:45
+msgid "Certificate details"
+msgstr "Detalles del certificado"
+
+#: ../smime/gui/smime-ui.ui.h:46
+msgid "Email Certificate Trust Settings"
+msgstr "Ajustes de confianza de certificados de correo-e"
+
+#: ../smime/gui/smime-ui.ui.h:47
+msgid "Trust the authenticity of this certificate"
+msgstr "Confiar en la autenticidad de este certificado"
+
+#: ../smime/gui/smime-ui.ui.h:48
+msgid "Do not trust the authenticity of this certificate"
+msgstr "No confiar en la autenticidad de este certificado"
+
+#: ../smime/gui/smime-ui.ui.h:49
 msgid "_Edit CA Trust"
 msgstr "_Editar confianza en la AC"
 
@@ -21598,52 +21602,52 @@ msgid "Imported Certificate"
 msgstr "Certificado importado"
 
 #: ../views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "Por _compaÃÃa"
-
-#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "_Tarjetas de visita"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
 msgid "_List View"
 msgstr "Vista de _lista"
 
-#: ../views/calendar/galview.xml.h:1
-msgid "W_eek View"
-msgstr "Vista _semanal"
+#: ../views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr "Por _compaÃÃa"
 
-#: ../views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:1
 msgid "_Day View"
 msgstr "Vista _diaria"
 
+#: ../views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr "Vista de la semana _laboral"
+
+#: ../views/calendar/galview.xml.h:3
+msgid "W_eek View"
+msgstr "Vista _semanal"
+
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Vista _mensual"
 
-#: ../views/calendar/galview.xml.h:5
-msgid "_Work Week View"
-msgstr "Vista de la semana _laboral"
-
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Como carpeta de enviados para la vista anc_ha"
+msgid "_Messages"
+msgstr "_Mensajes"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Como carpeta de _enviados"
 
 #: ../views/mail/galview.xml.h:3
-msgid "By S_tatus"
-msgstr "Por es_tado"
+msgid "By Su_bject"
+msgstr "Por _asunto"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
 msgstr "Por rem_itente"
 
 #: ../views/mail/galview.xml.h:5
-msgid "By Su_bject"
-msgstr "Por _asunto"
+msgid "By S_tatus"
+msgstr "Por es_tado"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
@@ -21654,18 +21658,18 @@ msgid "For _Wide View"
 msgstr "Para la vista a_ncha"
 
 #: ../views/mail/galview.xml.h:8
-msgid "_Messages"
-msgstr "_Mensajes"
+msgid "As Sent Folder for Wi_de View"
+msgstr "Como carpeta de enviados para la vista anc_ha"
 
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
 msgstr "_Notas"
 
-#: ../views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Due Date"
 msgstr "Con fecha de _vencimiento"
 
-#: ../views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "Con _estado"
 
@@ -21682,15 +21686,7 @@ msgstr "UTC"
 msgid "Select a Time Zone"
 msgstr "Seleccione una zona horaria"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
-msgid "Time Zones"
-msgstr "Zonas horarias"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
-msgid "Timezone drop-down combination box"
-msgstr "Cada de combinaciÃn desplegable de la zona horaria"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -21700,10 +21696,18 @@ msgstr ""
 "una zona horaria.\n"
 "Use el botÃn derecho del ratÃn para reducir el mapa al tamaÃo anterior."
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+msgid "Time Zones"
+msgstr "Zonas horarias"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid "_Selection"
 msgstr "_SelecciÃn"
 
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
+msgid "Timezone drop-down combination box"
+msgstr "Cada de combinaciÃn desplegable de la zona horaria"
+
 #: ../widgets/menus/gal-define-views-dialog.c:359
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
@@ -21745,13 +21749,13 @@ msgid "Name of new view:"
 msgstr "Nombre de la vista nueva:"
 
 #: ../widgets/menus/gal-view-new-dialog.ui.h:2
-msgid "Type of View"
-msgstr "Tipo de vista"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
+msgid "Type of View"
+msgstr "Tipo de vista"
+
 #: ../widgets/misc/ea-calendar-item.c:306
 #: ../widgets/misc/ea-calendar-item.c:315
 msgid "%d %B %Y"
@@ -22200,136 +22204,136 @@ msgstr "Se llegà al principio de la pÃgina, continuando desde el final"
 msgid "When de_leted:"
 msgstr "Al e_liminar:"
 
-#: ../widgets/misc/e-send-options.ui.h:1
-msgid "A_uto-delete sent item"
-msgstr "_Autoeliminar el elemento enviado"
-
 #: ../widgets/misc/e-send-options.ui.h:3
-msgid "Creat_e a sent item to track information"
-msgstr "_Crear un elemento enviado para seguimiento de la informaciÃn"
-
-#: ../widgets/misc/e-send-options.ui.h:4
-msgid "Deli_vered and opened"
-msgstr "_Entregado y abierto"
-
-#: ../widgets/misc/e-send-options.ui.h:5
-msgid "Delivery Options"
-msgstr "Opciones de entrega"
+msgid "Standard"
+msgstr "EstÃndar"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Hasta"
-
-#: ../widgets/misc/e-send-options.ui.h:7
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_DespuÃs"
+msgid "Proprietary"
+msgstr "Propietario"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "dÃas"
+msgid "Secret"
+msgstr "Secreto"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "D_entro"
+msgid "Top Secret"
+msgstr "Alto secreto"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "dÃas"
-
-#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "SÃlo para usted"
 
+#. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:12
-msgid "Gene_ral Options"
-msgstr "Opciones gene_rales"
+msgctxt "send-options"
+msgid "None"
+msgstr "Ninguna"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:13
 msgid "Mail Receipt"
 msgstr "Destinatario del correo"
 
+#: ../widgets/misc/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "_Respuesta solicitada"
+
+#: ../widgets/misc/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "D_entro"
+
 #: ../widgets/misc/e-send-options.ui.h:17
-msgid "Proprietary"
-msgstr "Propietario"
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "dÃas"
 
 #: ../widgets/misc/e-send-options.ui.h:18
-msgid "R_eply requested"
-msgstr "_Respuesta solicitada"
+msgid "_When convenient"
+msgstr "_Cuando convenga"
 
 #: ../widgets/misc/e-send-options.ui.h:20
-msgid "Return Notification"
-msgstr "Devolver notificaciÃn"
+msgid "_Delay message delivery"
+msgstr "_Retrasar la entrega del mensaje"
 
 #: ../widgets/misc/e-send-options.ui.h:21
-msgid "Secret"
-msgstr "Secreto"
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_DespuÃs"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dÃas"
 
 #: ../widgets/misc/e-send-options.ui.h:23
-msgid "Sta_tus Tracking"
-msgstr "Seguimiento de es_tado"
+msgid "_Set expiration date"
+msgstr "_Establecer fecha de caducidad"
 
 #: ../widgets/misc/e-send-options.ui.h:24
-msgid "Standard"
-msgstr "EstÃndar"
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Hasta"
 
 #: ../widgets/misc/e-send-options.ui.h:25
-msgid "Status Tracking"
-msgstr "Seguimiento de estado"
+msgid "Delivery Options"
+msgstr "Opciones de entrega"
 
-#: ../widgets/misc/e-send-options.ui.h:26
-msgid "Top Secret"
-msgstr "Alto secreto"
+#: ../widgets/misc/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_ClasificaciÃn:"
 
 #: ../widgets/misc/e-send-options.ui.h:28
-msgid "When acce_pted:"
-msgstr "Al ace_ptar:"
+msgid "Gene_ral Options"
+msgstr "Opciones gene_rales"
 
 #: ../widgets/misc/e-send-options.ui.h:29
-msgid "When co_mpleted:"
-msgstr "Al _terminar:"
+msgid "Creat_e a sent item to track information"
+msgstr "_Crear un elemento enviado para seguimiento de la informaciÃn"
 
 #: ../widgets/misc/e-send-options.ui.h:30
-msgid "When decli_ned:"
-msgstr "Al _rechazar:"
+msgid "_Delivered"
+msgstr "_Entregado"
 
 #: ../widgets/misc/e-send-options.ui.h:31
-msgid "_All information"
-msgstr "_Toda la informaciÃn"
+msgid "Deli_vered and opened"
+msgstr "_Entregado y abierto"
 
 #: ../widgets/misc/e-send-options.ui.h:32
-msgid "_Classification:"
-msgstr "_ClasificaciÃn:"
+msgid "_All information"
+msgstr "_Toda la informaciÃn"
 
 #: ../widgets/misc/e-send-options.ui.h:33
-msgid "_Delay message delivery"
-msgstr "_Retrasar la entrega del mensaje"
+msgid "A_uto-delete sent item"
+msgstr "_Autoeliminar el elemento enviado"
 
 #: ../widgets/misc/e-send-options.ui.h:34
-msgid "_Delivered"
-msgstr "_Entregado"
+msgid "Status Tracking"
+msgstr "Seguimiento de estado"
+
+#: ../widgets/misc/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_Al abrir:"
 
 #: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Set expiration date"
-msgstr "_Establecer fecha de caducidad"
+msgid "When decli_ned:"
+msgstr "Al _rechazar:"
 
 #: ../widgets/misc/e-send-options.ui.h:37
-msgid "_When convenient"
-msgstr "_Cuando convenga"
+msgid "When co_mpleted:"
+msgstr "Al _terminar:"
 
 #: ../widgets/misc/e-send-options.ui.h:38
-msgid "_When opened:"
-msgstr "_Al abrir:"
+msgid "When acce_pted:"
+msgstr "Al ace_ptar:"
+
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Devolver notificaciÃn"
 
-#. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-msgctxt "send-options"
-msgid "None"
-msgstr "Ninguna"
+msgid "Sta_tus Tracking"
+msgstr "Seguimiento de es_tado"
 
 #: ../widgets/misc/e-signature-editor.c:138
 #: ../widgets/misc/e-signature-editor.c:564
@@ -22481,7 +22485,7 @@ msgid "No grouping"
 msgstr "Sin agrupar"
 
 #: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:11
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "Show Fields"
 msgstr "Mostrar campos"
 
@@ -22489,87 +22493,87 @@ msgstr "Mostrar campos"
 msgid "Available Fields"
 msgstr "Campos disponibles"
 
-#: ../widgets/table/e-table-config.ui.h:1
+#: ../widgets/table/e-table-config.ui.h:2
 msgid "A_vailable Fields:"
 msgstr "Campos _disponibles:"
 
-#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1721
-msgid "Ascending"
-msgstr "Ascendente"
-
 #: ../widgets/table/e-table-config.ui.h:3
-msgid "Clear All"
-msgstr "Quitar todo"
+msgid "_Show these fields in order:"
+msgstr "_Mostrar estos campos en orden:"
 
 #: ../widgets/table/e-table-config.ui.h:4
-msgid "Clear _All"
-msgstr "Quitar _todo"
+msgid "Move _Up"
+msgstr "_Subir"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1721
-msgid "Descending"
-msgstr "Descendente"
+msgid "Move _Down"
+msgstr "_Bajar"
 
-#: ../widgets/table/e-table-config.ui.h:8
-msgid "Group Items By"
-msgstr "Agrupar elementos por"
+#: ../widgets/table/e-table-config.ui.h:7
+msgid "_Remove"
+msgstr "_Quitar"
 
 #: ../widgets/table/e-table-config.ui.h:9
-msgid "Move _Down"
-msgstr "_Bajar"
+msgid "_Show field in View"
+msgstr "_Mostrar campo en la vista"
 
 #: ../widgets/table/e-table-config.ui.h:10
-msgid "Move _Up"
-msgstr "_Subir"
+#: ../widgets/table/e-table-header-item.c:1721
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: ../widgets/table/e-table-config.ui.h:11
+#: ../widgets/table/e-table-header-item.c:1721
+msgid "Descending"
+msgstr "Descendente"
 
 #: ../widgets/table/e-table-config.ui.h:12
+msgid "Group Items By"
+msgstr "Agrupar elementos por"
+
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show _field in View"
 msgstr "Mostrar ca_mpo en la vista"
 
-#: ../widgets/table/e-table-config.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:14
+msgid "Then By"
+msgstr "Luego por"
+
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Show field i_n View"
 msgstr "Mostrar campo e_n la vista"
 
-#: ../widgets/table/e-table-config.ui.h:14
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Show field in _View"
 msgstr "Mostrar campo en la _vista"
 
-#: ../widgets/table/e-table-config.ui.h:15
+#: ../widgets/table/e-table-config.ui.h:17
+msgid "Clear _All"
+msgstr "Quitar _todo"
+
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "Sort"
 msgstr "Ordenar"
 
-#: ../widgets/table/e-table-config.ui.h:16
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "Sort Items By"
 msgstr "Ordenar elementos por"
 
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Then By"
-msgstr "Luego por"
-
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "_Fields Shown..."
-msgstr "_Campos mostradosâ"
-
 #: ../widgets/table/e-table-config.ui.h:20
-msgid "_Group By..."
-msgstr "_Agrupar porâ"
+msgid "Clear All"
+msgstr "Quitar todo"
 
 #: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "_Quitar"
+msgid "_Sort..."
+msgstr "_Ordenarâ"
 
 #: ../widgets/table/e-table-config.ui.h:22
-msgid "_Show field in View"
-msgstr "_Mostrar campo en la vista"
+msgid "_Group By..."
+msgstr "_Agrupar porâ"
 
 #: ../widgets/table/e-table-config.ui.h:23
-msgid "_Show these fields in order:"
-msgstr "_Mostrar estos campos en orden:"
-
-#: ../widgets/table/e-table-config.ui.h:24
-msgid "_Sort..."
-msgstr "_Ordenarâ"
+msgid "_Fields Shown..."
+msgstr "_Campos mostradosâ"
 
 #: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
@@ -25046,9 +25050,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Focused Column"
 #~ msgstr "Columna enfocada"
 
-#~ msgid "Unselected Column"
-#~ msgstr "Columna deseleccionada"
-
 #~ msgid "Strikeout Column"
 #~ msgstr "Tachar columna"
 



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