Updated Spanish translation.

2005-01-20 Francisco Javier F. Serrador <serrador@cvs.gnome.org> * es.po: Updated Spanish translation. svn path=/trunk/; revision=28466
author: Francisco Javier F. Serrador <serrador@cvs.gnome.org> 2005-01-21 01:04:53 +0800
committer: Francisco Javier Fernandez Serrador <serrador@src.gnome.org> 2005-01-21 01:04:53 +0800
commit: a50635be1f2aa13eabd81d435bfe2057d30fa0e0 (patch)
tree: 2626e1d7b753d79000f44a7385c9bb76f775142d /po/es.po
parent: a7f9e241e7483e125921ad10b5aaa01ddbc85b52 (diff)
download: gsoc2013-evolution-a50635be1f2aa13eabd81d435bfe2057d30fa0e0.tar.gz
gsoc2013-evolution-a50635be1f2aa13eabd81d435bfe2057d30fa0e0.tar.zst
gsoc2013-evolution-a50635be1f2aa13eabd81d435bfe2057d30fa0e0.zip
1 files changed, 7192 insertions, 7017 deletions
diff --git a/po/es.po b/po/es.po
index 9b693ad41b..f1b52a69ca 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,56 +9,257 @@
 # Eneko Lacunza <enlar@iname.com>, 2001-2002.
 # Héctor García Álvarez <hector@scouts-es.org>, 2002.
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2003 (revisión).
-# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004.
+# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004, 2005.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-28 15:20+0200\n"
-"PO-Revision-Date: 2004-08-28 15:22+0200\n"
+"POT-Creation-Date: 2005-01-20 16:05+0100\n"
+"PO-Revision-Date: 2005-01-20 18:02+0100\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.9.1\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:119
+#: a11y/addressbook/ea-minicard-view.c:172
 msgid "evolution addressbook"
 msgstr "libreta de direcciones de Evolution"
 
-#: a11y/addressbook/ea-minicard-view.c:101
+#: a11y/addressbook/ea-minicard.c:31
+#: calendar/gui/alarm-notify/alarm-queue.c:863
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Abrir"
+
+#: a11y/addressbook/ea-minicard.c:138
+msgid "Contact List: "
+msgstr "Lista de contactos:"
+
+#: a11y/addressbook/ea-minicard.c:139
+msgid "Contact: "
+msgstr "Contacto: "
+
+#: a11y/addressbook/ea-minicard.c:165
+msgid "evolution minicard"
+msgstr "minitarjeta de Evolution"
+
+#: a11y/addressbook/ea-minicard-view.c:34
+#: addressbook/gui/component/addressbook-component.c:97
+msgid "New Contact"
+msgstr "Contacto nuevo"
+
+#: a11y/addressbook/ea-minicard-view.c:35
+#: addressbook/gui/component/addressbook-component.c:105
+msgid "New Contact List"
+msgstr "Lista de contactos nueva"
+
+#: a11y/addressbook/ea-minicard-view.c:153
 msgid "current addressbook folder "
 msgstr "carpeta de libretas de direcciones actual"
 
-#: a11y/addressbook/ea-minicard-view.c:102
+#: a11y/addressbook/ea-minicard-view.c:154
 msgid "have "
 msgstr "tiene"
 
-#: a11y/addressbook/ea-minicard-view.c:102
+#: a11y/addressbook/ea-minicard-view.c:154
 msgid "has "
 msgstr "tiene "
 
-#: a11y/addressbook/ea-minicard-view.c:104
+#: a11y/addressbook/ea-minicard-view.c:156
 msgid " cards"
 msgstr "tarjetas"
 
-#: a11y/addressbook/ea-minicard-view.c:104
+#: a11y/addressbook/ea-minicard-view.c:156
 msgid " card"
 msgstr "tarjeta"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "cabecera del contacto: "
+#: a11y/calendar/ea-cal-view.c:306
+msgid "New Appointment"
+msgstr "Cita nueva"
+
+#: a11y/calendar/ea-cal-view.c:307
+msgid "New All Day Event"
+msgstr "Acontecimiento nuevo para todo el día"
 
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "minitarjeta de Evolution"
+#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1366
+msgid "New Meeting"
+msgstr "Reunión nueva"
+
+#: a11y/calendar/ea-cal-view.c:309
+msgid "Go to Today"
+msgstr "Ir a hoy"
+
+#: a11y/calendar/ea-cal-view.c:310
+msgid "Go to Date"
+msgstr "Ir a una fecha"
+
+#: a11y/calendar/ea-cal-view-event.c:235
+msgid "alarm "
+msgstr "alarma"
+
+#: a11y/calendar/ea-cal-view-event.c:241
+msgid "recurrence "
+msgstr "repetición"
+
+#: a11y/calendar/ea-cal-view-event.c:247
+msgid "time-zone "
+msgstr "zona horaria "
+
+#: a11y/calendar/ea-cal-view-event.c:253
+msgid "meeting "
+msgstr "reunión"
+
+#: a11y/calendar/ea-cal-view-event.c:258
+msgid "event. Summary is "
+msgstr "El resumen del acontecimiento es"
+
+#: a11y/calendar/ea-cal-view-event.c:269
+msgid "empty"
+msgstr "vacío"
+
+#: a11y/calendar/ea-cal-view-event.c:288
+msgid "calendar view event"
+msgstr "vista de acontecimientos del calendario"
+
+#: a11y/calendar/ea-cal-view-event.c:505
+msgid "Grab Focus"
+msgstr "Obtener el foco"
+
+#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#, c-format
+msgid ", %d event"
+msgstr ",%d acontecimiento"
+
+#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#, c-format
+msgid ", %d events"
+msgstr "%d acontecimientos"
+
+#: a11y/calendar/ea-day-view.c:150
+msgid "work week view :"
+msgstr "vista de la semana laboral:"
+
+#: a11y/calendar/ea-day-view.c:154
+msgid "day view :"
+msgstr "vista diaria:"
+
+#: a11y/calendar/ea-day-view.c:181
+msgid "calendar view for a work week"
+msgstr "Vista de calendario para una semana laboral"
+
+#: a11y/calendar/ea-day-view.c:183
+msgid "calendar view for one or more days"
+msgstr "vista de calendario para uno o más días"
+
+#: a11y/calendar/ea-day-view-main-item.c:299
+#: a11y/calendar/ea-week-view-main-item.c:301
+msgid "a table to view and select the current time range"
+msgstr "una tabla para ver y seleccionar el rango de tiempo actual"
+
+#: a11y/calendar/ea-gnome-calendar.c:187 calendar/gui/calendar-component.c:520
+msgid "%A %d %b %Y"
+msgstr "%a, %d de %b de %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:523
+#: calendar/gui/e-day-view.c:1511 calendar/gui/e-day-view-top-item.c:719
+#: calendar/gui/e-week-view-main-item.c:321
+msgid "%a %d %b"
+msgstr "%a, %d de %b"
+
+#: a11y/calendar/ea-gnome-calendar.c:192 a11y/calendar/ea-gnome-calendar.c:197
+#: a11y/calendar/ea-gnome-calendar.c:199 calendar/gui/calendar-component.c:525
+#: calendar/gui/calendar-component.c:530 calendar/gui/calendar-component.c:532
+msgid "%a %d %b %Y"
+msgstr "%a, %d de %b de %Y"
+
+#: a11y/calendar/ea-gnome-calendar.c:216 a11y/calendar/ea-gnome-calendar.c:222
+#: a11y/calendar/ea-gnome-calendar.c:228 a11y/calendar/ea-gnome-calendar.c:230
+#: calendar/gui/calendar-component.c:544 calendar/gui/calendar-component.c:551
+#: calendar/gui/calendar-component.c:557 calendar/gui/calendar-component.c:559
+msgid "%d %b %Y"
+msgstr "%d de %B de %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:549
+#: calendar/gui/e-day-view.c:1527 calendar/gui/e-day-view-top-item.c:723
+#: calendar/gui/e-week-view-main-item.c:335
+msgid "%d %b"
+msgstr "%d de %b"
+
+#: a11y/calendar/ea-gnome-calendar.c:247 a11y/calendar/ea-gnome-calendar.c:255
+#: calendar/importers/icalendar-importer.c:726
+msgid "Gnome Calendar"
+msgstr "Gnome Calendar"
+
+#: a11y/calendar/ea-gnome-calendar.c:290
+msgid "search bar"
+msgstr "barra de búsqueda"
+
+#: a11y/calendar/ea-gnome-calendar.c:291
+msgid "evolution calendar search bar"
+msgstr "barra de búsqueda del calendario de Evolution"
+
+#: a11y/calendar/ea-jump-button.c:149
+msgid "Jump button"
+msgstr "Botón de salto"
+
+#: a11y/calendar/ea-jump-button.c:158
+msgid "Click here, you can find more events."
+msgstr "Pulse aquí para buscar más eventos."
+
+#: a11y/calendar/ea-week-view.c:153
+msgid "month view :"
+msgstr "vista mensual:"
+
+#: a11y/calendar/ea-week-view.c:158
+msgid "week view :"
+msgstr "vista semanal:"
+
+#: a11y/calendar/ea-week-view.c:185
+msgid "calendar view for a month"
+msgstr "vista de calendario para un mes"
+
+#: a11y/calendar/ea-week-view.c:187
+msgid "calendar view for one or more weeks"
+msgstr "vista de calendario para una o más semanas"
+
+#: a11y/widgets/ea-calendar-item.c:293 a11y/widgets/ea-calendar-item.c:299
+msgid " %d %B %Y"
+msgstr "%d de %B de %Y"
+
+#: a11y/widgets/ea-calendar-item.c:301
+msgid "calendar (from "
+msgstr "calendario (desde"
+
+#: a11y/widgets/ea-calendar-item.c:303
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
+msgid " to "
+msgstr " a "
+
+#: a11y/widgets/ea-calendar-item.c:305
+msgid ")"
+msgstr ")"
+
+#: a11y/widgets/ea-calendar-item.c:337
+msgid "evolution calendar item"
+msgstr "elemento de calendario de Evolution"
 
 #. addressbook:ldap-init primary
 #: addressbook/addressbook-errors.xml.h:2
@@ -68,7 +269,7 @@ msgstr "Esta libreta de direcciones no se pudo abrir."
 #. addressbook:ldap-init secondary
 #: addressbook/addressbook-errors.xml.h:4
 msgid ""
-"This addressbook server might unreachable or the server name may be "
+"This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 "Este servidor de libretas de direcciones quizá no se pueda alcanzar o el "
@@ -130,8 +331,18 @@ msgstr "El servidor LDAP no respondió con una información del esquema válida.
 msgid "Could not remove addressbook."
 msgstr "No se pudo eliminar la libreta de direcciones."
 
-#. addressbook:edit-categories primary
+#. addressbook:ask-delete-addressbook primary
 #: addressbook/addressbook-errors.xml.h:22
+msgid "Delete address book '{0}'?"
+msgstr "¿Quiere borrar la libreta de direcciones {0}?"
+
+#. addressbook:ask-delete-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "This address book will be removed permanently."
+msgstr "Esta libreta de direcciones se eliminará para siempre."
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:26
 msgid "Category editor not available."
 msgstr "No hay un editor de categorías disponible."
 
@@ -146,62 +357,62 @@ msgstr "No hay un editor de categorías disponible."
 #. mail:session-message-error-cancel secondary
 #. mail:ask-session-password secondary
 #. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:24
-#: addressbook/addressbook-errors.xml.h:32
-#: addressbook/addressbook-errors.xml.h:36 mail/mail-errors.xml.h:70
-#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
-#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
-#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
-#: mail/mail-errors.xml.h:88
+#: addressbook/addressbook-errors.xml.h:28
+#: addressbook/addressbook-errors.xml.h:36
+#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:75
+#: mail/mail-errors.xml.h:77 mail/mail-errors.xml.h:79
+#: mail/mail-errors.xml.h:81 mail/mail-errors.xml.h:83
+#: mail/mail-errors.xml.h:85 mail/mail-errors.xml.h:89
+#: mail/mail-errors.xml.h:93
 msgid "{0}"
 msgstr "{0}"
 
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
 #. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:26
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+#: addressbook/addressbook-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:97
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:28
+#: addressbook/addressbook-errors.xml.h:32
 msgid "Unable to open addressbook"
 msgstr "Imposible abrir la libreta de direcciones"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:30
+#: addressbook/addressbook-errors.xml.h:34
 msgid "Error loading addressbook."
 msgstr "Error cargando la libreta de direcciones."
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38
 msgid "Unable to perform search."
 msgstr "No es posible efectuar la búsqueda."
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:38
+#: addressbook/addressbook-errors.xml.h:42
 msgid "Would you like to save your changes?"
 msgstr "¿Desea guardar los cambios?"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:40
+#: addressbook/addressbook-errors.xml.h:44
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Ha hecho modificaciones a este contacto. ¿Desea guardar estos cambios?"
 
-#: addressbook/addressbook-errors.xml.h:41
+#: addressbook/addressbook-errors.xml.h:45
 msgid "_Discard"
 msgstr "_Descartar"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/addressbook-errors.xml.h:47
 msgid "Cannot move contact."
 msgstr "No se puede mover el contacto."
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:45
+#: addressbook/addressbook-errors.xml.h:49
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -210,145 +421,170 @@ msgstr ""
 "eliminado de la de origen. ¿Quiere guardar una copia en vez de mover?"
 
 #. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:47
+#: addressbook/addressbook-errors.xml.h:51
 msgid "Unable to save contact(s)."
 msgstr "No se pudo guardar el (los) contacto(s)."
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:49
+#: addressbook/addressbook-errors.xml.h:53
 msgid "Error saving contacts to {0}: {1}"
 msgstr "Error al guardar los contactos a {0}: {1}"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:51
+#: addressbook/addressbook-errors.xml.h:55
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "La libreta de direcciones de Evolution ha terminado inesperadamente."
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:53
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+#: addressbook/addressbook-errors.xml.h:57
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Sus contactos para {0} no estarán disponibles hasta que Evolution sea "
 "reiniciado."
 
+#. addressbook:ask-list-add-exists primary
+#: addressbook/addressbook-errors.xml.h:59
+msgid "Address '{0}' already exists."
+msgstr "La dirección «{0}» ya existe."
+
+#. addressbook:ask-list-add-exists secondary
+#: addressbook/addressbook-errors.xml.h:61
+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-errors.xml.h:62 mail/em-vfolder-rule.c:494
+#: plugins/shared-folder/properties.glade.h:17
+msgid "_Add"
+msgstr "_Añadir"
+
 #: addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Dirección de sincr. predeterminada:"
 
-#: addressbook/conduit/address-conduit.c:1181
-#: addressbook/conduit/address-conduit.c:1182
+#: addressbook/conduit/address-conduit.c:1183
+#: addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "No se pudo cargar la libreta de direcciones"
 
-#: addressbook/conduit/address-conduit.c:1250
-#: addressbook/conduit/address-conduit.c:1253
+#: addressbook/conduit/address-conduit.c:1252
+#: addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "No se pudo leer el bloque de la aplicación de Direcciones del Pilot"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Autocompletado"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "C_ontacts"
-msgstr "C_ontactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Certificates"
-msgstr "Certificados"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Configure el autocompletado aquí"
-
-#. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: addressbook/gui/component/addressbook-view.c:1144
-#: calendar/gui/migration.c:377
-msgid "Contacts"
-msgstr "Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
-msgstr "Libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Direcciones emergentes en la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Visor de tarjetas de la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Componente de libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Control de gestión de certificados S/Mime de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Control de configuración de preferencias de carpetas de Evolution"
+#: addressbook/gui/component/addressbook.c:98
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accediendo al servidor LDAP anónimamente"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manage your S/MIME certificates here"
-msgstr "Gestione sus certificados S/MIME aquí"
+#: addressbook/gui/component/addressbook.c:185
+#: plugins/groupwise-account-setup/camel-gw-listener.c:476
+msgid "Failed to authenticate.\n"
+msgstr "Falló al autenticarme.\n"
 
-#: addressbook/gui/component/addressbook-component.c:93
-msgid "New Contact"
-msgstr "Contacto nuevo"
+#: addressbook/gui/component/addressbook.c:192
+#: plugins/groupwise-account-setup/camel-gw-listener.c:460
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s Introduzca la contraseña para %s (usuario %s)"
 
-#: addressbook/gui/component/addressbook-component.c:94
+#: addressbook/gui/component/addressbook-component.c:98
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:95
+#: addressbook/gui/component/addressbook-component.c:99
 msgid "Create a new contact"
 msgstr "Crea un contacto nuevo"
 
-#: addressbook/gui/component/addressbook-component.c:101
-msgid "New Contact List"
-msgstr "Lista de contactos nueva"
-
-#: addressbook/gui/component/addressbook-component.c:102
+#: addressbook/gui/component/addressbook-component.c:106
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: addressbook/gui/component/addressbook-component.c:103
+#: addressbook/gui/component/addressbook-component.c:107
 msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
-#: addressbook/gui/component/addressbook-component.c:109
-#: addressbook/gui/component/addressbook-view.c:813
+#: addressbook/gui/component/addressbook-component.c:113
+#: addressbook/gui/component/addressbook-config.c:1116
+#: addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
-#: addressbook/gui/component/addressbook-component.c:110
+#: addressbook/gui/component/addressbook-component.c:114
 msgid "Address _Book"
 msgstr "_Libreta de direcciones"
 
-#: addressbook/gui/component/addressbook-component.c:111
+#: addressbook/gui/component/addressbook-component.c:115
 msgid "Create a new address book"
 msgstr "Crea una libreta de direcciones nueva"
 
-#: addressbook/gui/component/addressbook-component.c:184
+#: addressbook/gui/component/addressbook-component.c:188
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Falló al actualizar la configuración de la libreta o las carpetas."
 
+#: addressbook/gui/component/addressbook-config.c:315
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:510
+#: calendar/gui/dialogs/calendar-setup.c:191
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#: addressbook/gui/component/addressbook-config.c:609
+msgid "Copy book content locally for offline operation"
+msgstr "Copiar el contenido del libro localmente para operación desconectada"
+
+#: addressbook/gui/component/addressbook-config.c:904
+#: addressbook/gui/component/ldap-config.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.c:361
+#: calendar/gui/dialogs/calendar-setup.c:372
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: mail/em-folder-properties.c:214 mail/mail-config.glade.h:85
+#: smime/gui/smime-ui.glade.h:27
+msgid "General"
+msgstr "General"
+
+#: addressbook/gui/component/addressbook-config.c:905
+#: mail/importers/pine-importer.c:479
+msgid "Addressbook"
+msgstr "Libreta de direcciones"
+
+#: addressbook/gui/component/addressbook-config.c:909
+msgid "Server Information"
+msgstr "Información del servidor"
+
+#: addressbook/gui/component/addressbook-config.c:911
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: addressbook/gui/component/addressbook-config.c:914
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: mail/mail-dialogs.glade.h:12 smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "Detalles"
+
+#: addressbook/gui/component/addressbook-config.c:915
+msgid "Searching"
+msgstr "Búsqueda"
+
+#: addressbook/gui/component/addressbook-config.c:917
+msgid "Downloading"
+msgstr "Descargando"
+
+#: addressbook/gui/component/addressbook-config.c:1114
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Address Book Properties"
+msgstr "Propiedades de la libreta de direcciones"
+
 #: addressbook/gui/component/addressbook-migrate.c:72
-#: calendar/gui/migration.c:141 mail/em-migrate.c:1160
+#: calendar/gui/migration.c:142 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Migrando..."
 
 #: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:188 mail/em-migrate.c:1201
+#: calendar/gui/migration.c:189 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando «%s»:"
@@ -356,9 +592,9 @@ msgstr "Migrando «%s»:"
 #. create the local source group
 #. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/migration.c:450 calendar/gui/migration.c:532
+#: calendar/gui/migration.c:452 calendar/gui/migration.c:545
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-component.c:249 mail/mail-vfolder.c:218
+#: mail/mail-component.c:270 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "En este equipo"
 
@@ -367,10 +603,10 @@ msgstr "En este equipo"
 #. Create the default Person task list
 #. orange
 #: addressbook/gui/component/addressbook-migrate.c:501
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/migration.c:458 calendar/gui/migration.c:540
-#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
-#: mail/mail-config.glade.h:109
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/migration.c:460 calendar/gui/migration.c:553
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:77
+#: mail/mail-config.glade.h:102
 msgid "Personal"
 msgstr "Privado"
 
@@ -430,66 +666,134 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus datos Pilot Sync..."
 
-#: addressbook/gui/component/addressbook-view.c:711
-#, c-format
-msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr "La libreta «%s» será eliminada. ¿Seguro que quiere continuar?"
-
-#: addressbook/gui/component/addressbook-view.c:814
-#: addressbook/gui/widgets/e-addressbook-view.c:1124
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:376
+#: addressbook/gui/component/addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-view.c:934
+#: calendar/gui/calendar-component.c:386 calendar/gui/tasks-component.c:330
 #: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-calendar.xml.h:5 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Borrar"
 
-#: addressbook/gui/component/addressbook-view.c:815
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:378
+#: addressbook/gui/component/addressbook-view.c:760
+#: calendar/gui/calendar-component.c:387 calendar/gui/tasks-component.c:331
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: addressbook/gui/component/addressbook.c:98
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accediendo al servidor LDAP anónimamente"
-
-#: addressbook/gui/component/addressbook.c:184
-#: camel/providers/groupwise/camel-gw-listener.c:420
-msgid "Failed to authenticate.\n"
-msgstr "Falló al autenticarme.\n"
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:1119
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: calendar/gui/migration.c:378
+msgid "Contacts"
+msgstr "Contactos"
 
-#: addressbook/gui/component/addressbook.c:191
-#: camel/providers/groupwise/camel-gw-listener.c:409
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s Introduzca la contraseña para %s (usuario %s)"
+#: addressbook/gui/component/addressbook-view.c:1130
+msgid "Contact Source Selector"
+msgstr "Selector de origen de contactos"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
-msgid "EFolderList xml for the list of completion uris"
-msgstr "Xml EFolderList para la lista de URIs de completado"
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "XML EFolderList para la lista de URIs de completado"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "XML EFolderList para la lista de URIs de completado."
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "Position of the vertical pane in main view"
 msgstr "Posición del panel vertical en la vista principal"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+msgid "Position of the vertical pane in main view."
+msgstr "Posición del panel vertical en la vista principal."
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "Mostrar el panel de vista previa"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "Mostrar el panel de vista previa."
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid ""
-"The number of characters that must be typed before evolution will attempt to "
+"The number of characters that must be typed before Evolution will attempt to "
 "autocomplete"
 msgstr ""
-"El número de caracteres que deben ser tecleados antes de que Evolution "
+"El número de caracteres que deben teclearse antes de que Evolution "
 "intente auto-completar"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+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 auto-completar."
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 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"
 
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+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."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "Autocompletado"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "C_ontactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "Certificados"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "Configure el autocompletado aquí"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook"
+msgstr "Libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address pop-up"
+msgstr "Direcciones emergentes en la libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address viewer"
+msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook card viewer"
+msgstr "Visor de tarjetas de la libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook component"
+msgstr "Componente de libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Control de gestión de certificados S/Mime de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Control de configuración de preferencias de carpetas de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr "Gestione sus certificados S/MIME aquí"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
@@ -505,6 +809,7 @@ msgstr ""
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
+#: plugins/shared-folder/properties.glade.h:3
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -558,12 +863,8 @@ msgstr "<b>Tipo:</b>"
 msgid "Add Address Book"
 msgstr "Añade una libreta de direcciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "Address Book Properties"
-msgstr "Propiedades de la libreta de direcciones"
-
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:15
+#: mail/em-account-editor.c:292
 msgid "Always"
 msgstr "Siempre"
 
@@ -575,11 +876,6 @@ msgstr "Anónimamente"
 msgid "Basic"
 msgstr "Básico"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
-msgid "Details"
-msgstr "Detalles"
-
 #: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Nombre distintivo"
@@ -589,27 +885,19 @@ msgid "Email address"
 msgstr "Dirección de correo-e"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution usará esta dirección de correo-e para autenticarle con el servidor."
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Evolution usará esta dirección de correo-e para autenticarle con el servidor."
 
 #: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Encontrar bases de búsqueda posibles"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
-msgid "General"
-msgstr "General"
-
 #: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "_Inicio de sesión:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:25
+#: mail/em-account-editor.c:290
 msgid "Never"
 msgstr "Nunca"
 
@@ -699,12 +987,12 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
+"This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 "Este es el método que usará Evolution para autenticarle a usted.  Note que "
-"establecer esto a «Dirección de Correo-e» requiere acceso anónimo a su "
+"establecer esto a «Dirección de correo-e» requiere acceso anónimo a su "
 "servidor ldap."
 
 #: addressbook/gui/component/ldap-config.glade.h:38
@@ -733,8 +1021,8 @@ msgstr "Usando «Nombre Distintivo» (ND)"
 msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
-#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:156
+#: addressbook/gui/component/ldap-config.glade.h:42
+#: mail/em-account-editor.c:291
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
@@ -755,7 +1043,8 @@ msgid "_Log in method:"
 msgstr "Método de _inicio de sesión:"
 
 #: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+#: calendar/gui/dialogs/calendar-setup.c:243
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nombre:"
 
@@ -784,90 +1073,13 @@ msgid "cards"
 msgstr "tarjetas"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
 #: calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
-#: mail/mail-config.glade.h:183
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
+#: mail/em-account-editor.c:1821 plugins/calendar-http/calendar-http.c:263
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr ""
-"Interfaz de selección de nombre de la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Eliminar todo"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
-#: addressbook/gui/component/select-names/e-select-names.c:702
-#: calendar/gui/dialogs/cal-prefs-dialog.c:724
-msgid "Remove"
-msgstr "Eliminar"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:222
-msgid "View Contact List"
-msgstr "Ver lista de contactos"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:222
-msgid "View Contact Info"
-msgstr "Ver información del contacto"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:229
-#: addressbook/gui/component/select-names/e-select-names-popup.c:330
-msgid "Send HTML Mail?"
-msgstr "¿Enviar correo en HTML?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
-msgid "Add to Contacts"
-msgstr "Añadir a contactos"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:348
-msgid "Unnamed Contact"
-msgstr "Contacto anónimo"
-
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nombre"
-
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
-#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:228
-msgid "Source"
-msgstr "Fuente"
-
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Selecciona contactos de la libreta de direcciones"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "<b>Contacts</b>"
-msgstr "<b>Contactos</b>"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>Mostrar contactos</b>"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Address _Book:"
-msgstr "_Libreta de direcciones:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "C_ategory:"
-msgstr "_Categoría:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "_Find"
-msgstr "_Buscar"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Search:"
-msgstr "_Buscar:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Correo-e</b>"
@@ -906,180 +1118,209 @@ msgstr "<b>Trabajo</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address:"
-msgstr "Dirección:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: addressbook/gui/widgets/e-minicard.c:181
+msgid "Contact"
+msgstr "Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-msgid "Anniversary:"
-msgstr "Aniversario:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:533
+msgid "Contact Editor"
+msgstr "Editor de contactos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "Assistant:"
-msgstr "Secretario:"
+msgid "Full _Name..."
+msgstr "_Nombre completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Birthday:"
-msgstr "Cumpleaños:"
+msgid "Image"
+msgstr "Imagen"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "Calendar:"
-msgstr "Calendario:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "City:"
-msgstr "Ciudad:"
+msgid "Mailing Address"
+msgstr "Dirección de correo"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Company:"
-msgstr "Empresa:"
+msgid "Ni_ckname:"
+msgstr "_Apodo:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:172
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:181
-msgid "Contact"
-msgstr "Contacto"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:526
-msgid "Contact Editor"
-msgstr "Editor de contactos"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "Country:"
-msgstr "País:"
+msgid "Personal Information"
+msgstr "Información personal"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "Department:"
-msgstr "Departamento:"
+msgid "Telephone"
+msgstr "Teléfono"
 
+#. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "Free/Busy:"
-msgstr "URL de disponibilidad:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:76
+#: mail/mail-config.glade.h:147
+msgid "Work"
+msgstr "Trabajo"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "Full _Name..."
-msgstr "_Nombre completo..."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "_Address:"
+msgstr "_Dirección:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Home Page:"
-msgstr "Página personal:"
+msgid "_Anniversary:"
+msgstr "_Aniversario:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
+msgid "_Assistant:"
+msgstr "_Secretario:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Mailing Address"
-msgstr "Dirección de correo"
+msgid "_Birthday:"
+msgstr "_Cumpleaños:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "Manager:"
-msgstr "Jefe:"
+#: plugins/itip-formatter/itip-view.c:1573
+msgid "_Calendar:"
+msgstr "_Calendario:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "Ni_ckname:"
-msgstr "_Apodo:"
+msgid "_Categories"
+msgstr "_Categorías"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "Notes:"
-msgstr "Notas:"
+msgid "_City:"
+msgstr "_Ciudad:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "Novell Groupwise"
-msgstr "Novell GroupWise"
+msgid "_Company:"
+msgstr "_Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "Office:"
-msgstr "Oficina:"
+msgid "_Country:"
+msgstr "_País:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "PO Box:"
-msgstr "Apdo. de correos:"
+msgid "_Department:"
+msgstr "_Departamento:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+msgid "_File under:"
+msgstr "_Archivar como:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-msgid "Personal Information"
-msgstr "Información personal"
+msgid "_Free/Busy:"
+msgstr "_Disponibilidad:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "Profession:"
-msgstr "Profesión:"
+msgid "_Home Page:"
+msgstr "_Página personal:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "Spouse:"
-msgstr "Cónyuge:"
+msgid "_Manager:"
+msgstr "_Jefe:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "State/Province:"
-msgstr "Estado/Provincia:"
+msgid "_Notes:"
+msgstr "_Notas:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:39
-msgid "Title:"
-msgstr "Tratamiento:"
+msgid "_Office:"
+msgstr "_Oficina:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:40
-msgid "Video Chat:"
-msgstr "Charla por vídeo:"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_PO Box:"
+msgstr "_Apdo. de correos:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
-msgid "Wants to receive HTML mail"
-msgstr "Quiere recibir el correo como HTML"
+msgid "_Profession:"
+msgstr "_Profesión:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Web Log:"
-msgstr "Web Log:"
+msgid "_Spouse:"
+msgstr "_Cónyuge:"
 
-#. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
-#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
-#: mail/mail-config.glade.h:157
-msgid "Work"
-msgstr "Trabajo"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_State/Province:"
+msgstr "E_stado/Provincia:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:44
-msgid "Zip/Postal Code:"
-msgstr "Código postal:"
+#: addressbook/gui/contact-editor/fullname.glade.h:18
+msgid "_Title:"
+msgstr "_Tratamiento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:45
-msgid "_Categories"
-msgstr "_Categorías"
+msgid "_Video Chat:"
+msgstr "_Charla por vídeo:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:46
-msgid "_File under:"
-msgstr "_Archivar como:"
+msgid "_Wants to receive HTML mail"
+msgstr "_Quiere recibir el correo como HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+msgid "_Web Log:"
+msgstr "_Web Log:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Donde:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:49
+msgid "_Zip/Postal Code:"
+msgstr "_Código postal:"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"¿Está seguro de que quiere\n"
+"borrar estos contactos?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:322
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"¿Seguro que quiere\n"
+"borrar este contacto?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:352
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Address"
 msgstr "Dirección"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:186
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:182
 #: addressbook/gui/widgets/e-addressbook-model.c:309
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view.c:519
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: addressbook/gui/widgets/e-minicard-view.c:498
-#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Editable"
 
@@ -1209,7 +1450,7 @@ msgstr "Brasil"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
-msgstr "Territorios británicos en el océano Índico"
+msgstr "Territorios británicos en el océano Indico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
@@ -1573,7 +1814,7 @@ msgstr "Líbano"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
-msgstr "Lesotho"
+msgstr "Lesoto"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
@@ -1820,7 +2061,7 @@ msgid "Saint Lucia"
 msgstr "Santa Lucia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Saint Vincent And The Grena-dines"
+msgid "Saint Vincent And The Grenadines"
 msgstr "San Vicente y los Granadinos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
@@ -1913,7 +2154,7 @@ msgstr "Islas Svalbard y Jan Mayen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
-msgstr "Suazilandia"
+msgstr "Swazilandia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
@@ -2051,65 +2292,43 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "Mensajería instantánea de AOL"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:351
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "MSN"
+msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Servicio"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "Ubicación"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Usuario"
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "GroupWise"
+msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 #: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
 msgid "Home"
 msgstr "Domicilio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 #: addressbook/gui/contact-editor/e-contact-editor.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:338
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:337
-msgid "MSN"
-msgstr "MSN"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
-#: addressbook/gui/widgets/eab-contact-display.c:334
-msgid "GroupWise"
-msgstr "GroupWise"
-
 #: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Libro fuente"
@@ -2126,23 +2345,27 @@ msgstr "Es un contacto nuevo"
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:300
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+msgid "Required Fields"
+msgstr "Campos requeridos"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:307
 msgid "Changed"
 msgstr "Modificados"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2456
+#: addressbook/gui/contact-editor/e-contact-editor.c:2463
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertenece a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2549
+#: addressbook/gui/contact-editor/e-contact-editor.c:2556
 msgid "Please select an image for this contact"
 msgstr "Por favor seleccione una imagen para este contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2550
+#: addressbook/gui/contact-editor/e-contact-editor.c:2557
 msgid "No image"
 msgstr "Sin imagen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2778
+#: addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2150,10 +2373,38 @@ msgstr ""
 "La fecha del contacto es inválida:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2806
+#: addressbook/gui/contact-editor/e-contact-editor.c:2885
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: plugins/plugin-manager/plugin-manager.c:44
+#: plugins/save-attachments/save-attachments.c:362
+msgid "Name"
+msgstr "Nombre"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "Mensajería instantánea de AOL"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Servicio"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Lugar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Usuario"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Añadir contacto rápido"
@@ -2163,7 +2414,7 @@ msgid "_Edit Full"
 msgstr "_Editar todo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:156
 msgid "_Full Name:"
 msgstr "Nombre _completo:"
 
@@ -2171,22 +2422,6 @@ msgstr "Nombre _completo:"
 msgid "E-_mail:"
 msgstr "_Correo-e:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"¿Está seguro de que quiere\n"
-"borrar estos contactos?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:322
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"¿Seguro que quiere\n"
-"borrar este contacto?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Dirección _2:"
@@ -2203,18 +2438,6 @@ msgstr "P_aís:"
 msgid "Full Address"
 msgstr "Dirección completa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "_Address:"
-msgstr "_Dirección:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
-msgid "_PO Box:"
-msgstr "_Apdo. de correos:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_State/Province:"
-msgstr "E_stado/Provincia:"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "Código _postal:"
@@ -2284,10 +2507,6 @@ msgstr "_2º Nombre:"
 msgid "_Suffix:"
 msgstr "_Sufijo:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:18
-msgid "_Title:"
-msgstr "_Tratamiento:"
-
 #: addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Añadir cuenta de MI"
@@ -2313,22 +2532,23 @@ msgid "Add an email to the List"
 msgstr "Añadir un correo-e a la lista"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:819
+msgid "Contact List Editor"
+msgstr "Editor de listas de contactos"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email adresses from Adress Book"
 msgstr "Insertar direcciones de correo-e desde la libreta de direcciones"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:714
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:709
 msgid "Members"
 msgstr "Miembros"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Quitar una dirección de correo-e de la lista"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
-msgid "Select"
-msgstr "Seleccionar"
-
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ocultar direcciones al mandar correo a esta lista"
@@ -2338,37 +2558,29 @@ msgid "_List name:"
 msgstr "_Nombre de la lista:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
-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:"
+msgid "_Select"
+msgstr "_Seleccionar"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "diálogo1"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+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:165
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
 #: addressbook/gui/widgets/e-addressbook-model.c:295
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:221
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:377
+#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-minicard-view.c:505
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Libro"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:179
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:175
 msgid "Is New List"
 msgstr "Es una lista nueva"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:736
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Participantes requeridos"
-
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813
-msgid "Contact List Editor"
-msgstr "Editor de listas de contactos"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:712
+msgid "Contact List Members"
+msgstr "Miembros de la lista de contactos"
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2408,403 +2620,11 @@ msgstr ""
 "en esta carpeta.  ¿Quiere añadirlo de todos modos?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:170
+#: addressbook/gui/search/e-addressbook-search-dialog.c:160
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "Sin contactos"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d contacto"
-msgstr[1] "%d contactos"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:235
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:491
-msgid "Query"
-msgstr "Consulta"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Error al obtener la vista de libro"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Modelo"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Error modificando tarjeta"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-msgid "Name begins with"
-msgstr "El nombre empieza por"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:168
-msgid "Email begins with"
-msgstr "El correo-e empieza por"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:169
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "La categoría es"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Cualquier campo contiene"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: addressbook/gui/widgets/e-addressbook-view.c:176
-msgid "Advanced..."
-msgstr "Avanzado..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:242
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Tipo"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:544
-msgid "Address Book"
-msgstr "Libreta de direcciones"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-#: addressbook/gui/widgets/e-addressbook-view.c:2098
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "Guardar como VCard..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1095
-msgid "New Contact..."
-msgstr "Contacto nuevo..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
-msgid "New Contact List..."
-msgstr "Lista de contactos nueva..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-msgid "Go to Folder..."
-msgstr "Ir a la carpeta..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-msgid "Import..."
-msgstr "Importar..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1102
-msgid "Search for Contacts..."
-msgstr "Buscar contactos..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1103
-msgid "Address Book Sources..."
-msgstr "Fuentes de la libreta de direcciones..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1105
-msgid "Pilot Settings..."
-msgstr "Configuración del Pilot..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Reenviar contacto"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1110
-msgid "Send Message to Contact"
-msgstr "Envía un mensaje al contacto"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1111 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Imprimir"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-msgid "Print Envelope"
-msgstr "Imprimir sobre"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1117
-msgid "Copy to Address Book..."
-msgstr "Copiar a la libreta de direcciones..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1118
-msgid "Move to Address Book..."
-msgstr "Mover a la libreta de direcciones..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1121
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Cortar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1122
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:374
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copiar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1123
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Pegar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1128
-#: calendar/gui/e-calendar-view.c:1418
-msgid "Current View"
-msgstr "Vista actual"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1683
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "Cualquier categoría"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Secretario"
-
-#: 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:3
-msgid "Business Fax"
-msgstr "Fax del trabajo"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Teléfono del trabajo"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Teléfono del trabajo 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Teléfono para devolución de llamadas"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Teléfono del coche"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Categories"
-msgstr "Categorías"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Teléfono de la compañía"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:547 smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Correo-e"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Correo-e 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Correo-e 3"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Family Name"
-msgstr "Apellidos"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "Archivar como"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Given Name"
-msgstr "Nombre dado"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Fax de casa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Teléfono de casa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Teléfono de casa 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "Teléfono RDSI"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "Diario"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Jefe"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:366
-msgid "Mobile Phone"
-msgstr "Teléfono móvil"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Apodo"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:377
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Oficina"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:347
-msgid "Organization"
-msgstr "Organización"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-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
-msgid "Pager"
-msgstr "Buscapersonas"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Teléfono principal"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Papel"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "Cónyuge"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "TTYTDD"
-msgstr "TTY/TDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Télex"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Tratamiento"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "Unidad"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "Sitio web"
-
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
-msgid "Width"
-msgstr "Ancho"
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
-msgid "Height"
-msgstr "Alto"
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
-msgid "Has Focus"
-msgstr "Tiene el foco"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Campo"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nombre del campo"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Modelo del texto"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Longitud máx. del campo"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Ancho de columna"
-
-#: addressbook/gui/widgets/e-minicard-view.c:164
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"No hay elementos para mostrar en esta vista.\n"
-"\n"
-"Pulse dos veces aquí para crear un contacto nuevo."
-
-#: addressbook/gui/widgets/e-minicard-view.c:167
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"No hay elementos para mostrar en esta vista."
-
-#: addressbook/gui/widgets/e-minicard-view.c:477
-msgid "Adapter"
-msgstr "Adaptador"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Seleccionado"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Tiene el cursor"
-
 #: addressbook/gui/widgets/eab-contact-display.c:133
 #: addressbook/gui/widgets/eab-contact-display.c:196
 msgid "(map)"
@@ -2815,55 +2635,76 @@ msgstr "(mapa)"
 msgid "map"
 msgstr "mapa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
-#: addressbook/gui/widgets/eab-contact-display.c:528
+#: addressbook/gui/widgets/eab-contact-display.c:274
+#: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "List Members"
 msgstr "Listar miembros"
 
-#: addressbook/gui/widgets/eab-contact-display.c:324
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:339
 msgid "E-mail"
 msgstr "Correo-e"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organización"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "Position"
 msgstr "Posición"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Video Conferencing"
 msgstr "Videoconferencia"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:378
 msgid "Phone"
 msgstr "Teléfono"
 
-#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "work"
 msgstr "trabajo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:582
+#: addressbook/gui/widgets/eab-contact-display.c:376
+#: addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:379
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Teléfono móvil"
+
+#: addressbook/gui/widgets/eab-contact-display.c:383
 msgid "personal"
 msgstr "personal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:543
+#: addressbook/gui/widgets/eab-contact-display.c:390
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Job Title"
 msgstr "Puesto"
 
-#: addressbook/gui/widgets/eab-contact-display.c:574
+#: addressbook/gui/widgets/eab-contact-display.c:560
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Correo-e"
+
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home page"
 msgstr "Página personal"
 
@@ -2918,13 +2759,9 @@ msgstr "Protocolo no implementado"
 #. E_BOOK_ERROR_CANCELLED
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
-#: calendar/gui/e-calendar-table.c:473 calendar/gui/print.c:2349
-#: camel/camel-service.c:724 camel/camel-service.c:762
-#: camel/camel-service.c:846 camel/camel-service.c:886
-#: camel/providers/pop3/camel-pop3-store.c:456
-#: camel/providers/pop3/camel-pop3-store.c:537
+#: calendar/gui/e-cal-component-preview.c:232
+#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-cal-model-tasks.c:347
+#: calendar/gui/e-cal-model-tasks.c:660 calendar/gui/print.c:2352
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -2935,6 +2772,7 @@ msgstr "No se pudo cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: addressbook/gui/widgets/eab-gui-util.c:63
+#: calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr "Falló en la autenticación"
 
@@ -2959,7 +2797,17 @@ msgstr "No existe ese origen"
 msgid "Other error"
 msgstr "Otro error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:91
+#: addressbook/gui/widgets/eab-gui-util.c:90
+msgid ""
+"We were unable to open this addressbook. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the addressbook once in online mode to download its contents"
+msgstr ""
+"No se pudo abrir esta libreta de direcciones. Esto significa que esta libreta "
+"no está marcada para su uso desconectado o no la ha descargado para uso desconectado. "
+"Por favor, cargue la libreta de direcciones una vez en modo conectado para descargar su contenido"
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2967,7 +2815,7 @@ msgstr ""
 "No se pudo abrir esta libreta de direcciones. Compruebe que la ruta exista y "
 "que tenga permisos para acceder a ella."
 
-#: addressbook/gui/widgets/eab-gui-util.c:98
+#: addressbook/gui/widgets/eab-gui-util.c:105
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2975,7 +2823,7 @@ msgstr ""
 "No se pudo abrir esta libreta de direcciones.  Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -2985,7 +2833,7 @@ msgstr ""
 "usar LDAP en Evolution debe instalar un paquete de Evolution con LDAP "
 "activado."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2993,7 +2841,7 @@ msgstr ""
 "No se pudo abrir esta libreta de direcciones. Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
-#: addressbook/gui/widgets/eab-gui-util.c:130
+#: addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3006,7 +2854,7 @@ msgstr ""
 "aumente el límite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
-#: addressbook/gui/widgets/eab-gui-util.c:136
+#: addressbook/gui/widgets/eab-gui-util.c:143
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3019,47 +2867,45 @@ msgstr ""
 "tiempo en las opciones del servidor de directorios para esta libreta\n"
 " de direcciones."
 
-#: addressbook/gui/widgets/eab-gui-util.c:142
+#: addressbook/gui/widgets/eab-gui-util.c:149
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"El soporte de esta libreta de direcciones no pudo analizar esta consulta."
+msgstr "El soporte de esta libreta de direcciones no pudo analizar esta consulta."
 
-#: addressbook/gui/widgets/eab-gui-util.c:145
+#: addressbook/gui/widgets/eab-gui-util.c:152
 msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
+msgstr "El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
 
-#: addressbook/gui/widgets/eab-gui-util.c:148
+#: addressbook/gui/widgets/eab-gui-util.c:155
 msgid "This query did not complete successfully."
 msgstr "Esta consulta no se completó con éxito."
 
-#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:177
 msgid "Error adding list"
 msgstr "Error añadiendo lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:170
-#: addressbook/gui/widgets/eab-gui-util.c:643
+#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error adding contact"
 msgstr "Error añadiendo contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:181
+#: addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying list"
 msgstr "Error modificando lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:181
+#: addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying contact"
 msgstr "Error modificando contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:200
 msgid "Error removing list"
 msgstr "Error eliminando lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:193
-#: addressbook/gui/widgets/eab-gui-util.c:601
+#: addressbook/gui/widgets/eab-gui-util.c:200
+#: addressbook/gui/widgets/eab-gui-util.c:608
 msgid "Error removing contact"
 msgstr "Error eliminando contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:275
+#: addressbook/gui/widgets/eab-gui-util.c:282
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3074,7 +2920,7 @@ msgstr[1] ""
 "Abrir %d contactos abrirá %d ventanas nuevas también.\n"
 "¿Quiere realmente mostrar todos estos contactos?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:304
+#: addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3083,44 +2929,44 @@ msgstr ""
 "%s ya existe\n"
 "¿Quiere sobreescribirlo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:308
+#: addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:386
+#: addressbook/gui/widgets/eab-gui-util.c:393
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:548
+#: addressbook/gui/widgets/eab-gui-util.c:555
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:697
+#: addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:699
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:702
+#: addressbook/gui/widgets/eab-gui-util.c:709
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:707
+#: addressbook/gui/widgets/eab-gui-util.c:714
 msgid "Select target addressbook."
 msgstr "Seleccione la libreta de direcciones destino."
 
-#: addressbook/gui/widgets/eab-gui-util.c:930
+#: addressbook/gui/widgets/eab-gui-util.c:937
 msgid "Multiple VCards"
 msgstr "VCards múltiples"
 
-#: addressbook/gui/widgets/eab-gui-util.c:933
+#: addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -3130,37 +2976,51 @@ msgstr "VCard para %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Correo-e principal"
 
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:441
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Correo-e 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:451
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Correo-e 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Seleccione una acción"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Crear un contacto nuevo «%s»"
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Añadir dirección al contacto existente «%s»"
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Consultando la libreta de direcciones..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Editar información del contacto"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:982
+msgid "Add to Contacts"
+msgstr "Añadir a contactos"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Combinar direcciones de correo-e"
 
@@ -3184,28 +3044,382 @@ msgstr "Mostrar VCard compacta"
 msgid "Save in addressbook"
 msgstr "Guardar en la libreta de direcciones"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "Sin contactos"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d contacto"
+msgstr[1] "%d contactos"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-minicard-view.c:512
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+msgid "Query"
+msgstr "Consulta"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Error al obtener la vista de libro"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+msgid "Model"
+msgstr "Modelo"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Error modificando tarjeta"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Name begins with"
+msgstr "El nombre empieza por"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Email begins with"
+msgstr "El correo-e empieza por"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "La categoría es"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: calendar/gui/cal-search-bar.c:48
+msgid "Any field contains"
+msgstr "Cualquier campo contiene"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:177
+msgid "Advanced..."
+msgstr "Avanzado..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:229
+msgid "Source"
+msgstr "Fuente"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:243
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:244
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Tipo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:540
+#: plugins/shared-folder/properties.glade.h:6
+msgid "Address Book"
+msgstr "Libreta de direcciones"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:1972
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "Guardar como VCard..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:917
+msgid "New Contact..."
+msgstr "Contacto nuevo..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:918
+msgid "New Contact List..."
+msgstr "Lista de contactos nueva..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:922
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Reenviar contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:923
+msgid "Send Message to Contact"
+msgstr "Envía un mensaje al contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:924 calendar/gui/print.c:2483
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Imprimir"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:927
+msgid "Copy to Address Book..."
+msgstr "Copiar a la libreta de direcciones..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:928
+msgid "Move to Address Book..."
+msgstr "Mover a la libreta de direcciones..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:932
+#: calendar/gui/calendar-component.c:385 calendar/gui/tasks-component.c:329
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Copiar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:933
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Pegar"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1526
+#: calendar/gui/cal-search-bar.c:346
+msgid "Any Category"
+msgstr "Cualquier categoría"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Secretario"
+
+#: 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:3
+msgid "Business Fax"
+msgstr "Fax del trabajo"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Teléfono del trabajo"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Teléfono del trabajo 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Teléfono para devolución de llamadas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Teléfono del coche"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "Categories"
+msgstr "Categorías"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "Teléfono de la compañía"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Apellidos"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "Archivar como"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr "Nombre dado"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Fax de casa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Teléfono de casa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Teléfono de casa 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "Teléfono RDSI"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Diario"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Jefe"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Apodo"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Oficina"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+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
+msgid "Pager"
+msgstr "Buscapersonas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Teléfono principal"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:251
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Papel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "Cónyuge"
+
+#. Translators: This is a vcard standard and stands for the type of
+#. phone used by the hearing impaired. TTY stands for "teletype"
+#. (familiar from Unix device names), and TDD is "Telecommunications
+#. 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
+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:43
+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:45
+msgid "Web Site"
+msgstr "Sitio web"
+
+#: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "Ancho"
+
+#: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "Alto"
+
+#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr "Tiene el foco"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Seleccionado"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Tiene el cursor"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Campo"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Nombre del campo"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Modelo del texto"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Longitud máx. del campo"
+
+#: addressbook/gui/widgets/e-minicard-view.c:171
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Buscar el contacto.\n"
+"\n"
+"o pulse dos veces aquí para crear un contacto nuevo."
+
+#: addressbook/gui/widgets/e-minicard-view.c:174
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"No hay elementos para mostrar en esta vista.\n"
+"\n"
+"Pulse dos veces aquí para crear un contacto nuevo."
+
+#: addressbook/gui/widgets/e-minicard-view.c:179
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+"\n"
+"\n"
+"Buscar contacto."
+
+#: addressbook/gui/widgets/e-minicard-view.c:181
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"No hay elementos para mostrar en esta vista."
+
+#: addressbook/gui/widgets/e-minicard-view.c:498
+msgid "Adapter"
+msgstr "Adaptador"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Ancho de columna"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "Vista de la tarjeta"
 
-#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
 msgstr "Vista de árbol GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
-msgid "Reflow Test"
-msgstr "Test de reflujo"
-
-#: addressbook/gui/widgets/test-reflow.c:120
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright © 2000, Ximian, Inc."
-
-#: addressbook/gui/widgets/test-reflow.c:122
-msgid "This should test the reflow canvas item"
-msgstr "Esto debería probar el reflujo del elemento lienzo"
-
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF de Evolution"
@@ -3219,18 +3433,9 @@ msgid "Evolution VCard Importer"
 msgstr "Importador de VCard de Evolution"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Importador de VCard de Evolution"
-
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Imprimir sobre"
-
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Imprimir contactos"
@@ -3240,6 +3445,11 @@ msgstr "Imprimir contactos"
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Imprimir sobre"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "Tahoma de 10 pt."
@@ -3332,7 +3542,7 @@ msgstr "Número de columnas:"
 msgid "Options"
 msgstr "Opciones"
 
-#: addressbook/printing/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24 e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Orientación"
 
@@ -3397,6 +3607,7 @@ msgid "Top:"
 msgstr "Encabezado:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
+#: calendar/gui/dialogs/calendar-setup.c:175
 msgid "Type:"
 msgstr "Tipo:"
 
@@ -3412,6 +3623,11 @@ msgstr "_Tipografía..."
 msgid "Contact Print Style Editor Test"
 msgstr "Test del Editor de impresión de estilos"
 
+#: addressbook/printing/test-contact-print-style-editor.c:54
+#: addressbook/printing/test-print.c:53
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr "Copyright © 2000, Ximian, Inc."
+
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr "Esto debería probar el  widget de estilo de impresión de contactos"
@@ -3424,20 +3640,6 @@ msgstr "Prueba de impresión de contactos"
 msgid "This should test the contact print code"
 msgstr "Esto debería probar el código de impresión de los contactos"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "No se pudo abrir el archivo"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "No se pudo obtener una lista de libretas de direcciones"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "fallo al abrir libreta de direcciones"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Especifique el archivo de salida en lugar del la salida estándar"
@@ -3459,12 +3661,11 @@ msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
 #: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
+msgid "Export in asynchronous mode"
 msgstr "Exportar en modo asíncrono"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "El número de tarjetas en un archivo de salida en modo asíncrono, tamaño por "
 "omisión 100."
@@ -3474,8 +3675,7 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Error en los argumentos de la línea de comandos, por favor use la opción --"
 "help para ver el uso."
@@ -3489,12 +3689,26 @@ msgid "In async mode, output must be file."
 msgstr "En modo asíncrono, la salida debe ser un archivo."
 
 #: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
+msgid "In normal mode, there is no need for the size option."
 msgstr "En modo normal, no hay necesidad de la opción de tamaño."
 
 #: addressbook/tools/evolution-addressbook-export.c:153
-msgid "Impossible internal error."
-msgstr "Error interno imposible."
+msgid "Unhandled error"
+msgstr "Error no tratado"
+
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "No se pudo abrir el archivo"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "No se pudo obtener una lista de libretas de direcciones"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "fallo al abrir libreta de direcciones"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3508,16 +3722,11 @@ msgstr "Archivo de entrada"
 msgid "No filename provided."
 msgstr "No ha especificado un nombre de archivo."
 
-#: addressbook/util/e-destination.c:577
-msgid "Unnamed List"
-msgstr "Lista de anónimos"
-
 #. calendar:prompt-cancel-meeting primary
 #. calendar:prompt-cancel-task primary
 #: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
-msgstr ""
-"¿Quiere enviar a todos los participantes una notificación de cancelación?"
+msgstr "¿Quiere enviar a todos los participantes una notificación de cancelación?"
 
 #. calendar:prompt-cancel-meeting secondary
 #: calendar/calendar-errors.xml.h:4
@@ -3547,8 +3756,7 @@ msgstr "¿Seguro que quiere borrar esta reunión?"
 
 #. calendar:prompt-delete-meeting secondary
 #: calendar/calendar-errors.xml.h:10
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Toda la información acerca de esta reunión será borrada y no podrá ser "
 "recuperada."
@@ -3615,8 +3823,7 @@ msgstr "¿Seguro que quiere borrar la cita titulada «{0}»?"
 #. calendar:prompt-delete-titled-appointment secondary
 #. calendar:prompt-delete-appointment secondary
 #: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Toda la información acerca de esta cita será borrada y no puede ser "
 "recuperada."
@@ -3639,10 +3846,8 @@ msgstr "¿Seguro que quiere borrar la entrada del diario «{0}»?"
 #. calendar:prompt-delete-named-journal secondary
 #. calendar:prompt-delete-journal secondary
 #: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr ""
-"Toda la información en este diario será borrada y no podrá recuperarse."
+msgid "All information in this journal will be deleted and can not be restored."
+msgstr "Toda la información en este diario será borrada y no podrá recuperarse."
 
 #. calendar:prompt-delete-appointments primary
 #: calendar/calendar-errors.xml.h:56
@@ -3654,8 +3859,7 @@ msgstr "¿Seguro que quiere borrar estas {0} citas?"
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr ""
-"Toda la información de estas citas será borrada y no puede ser recuperada."
+msgstr "Toda la información de estas citas será borrada y no puede ser recuperada."
 
 #. calendar:prompt-delete-tasks primary
 #: calendar/calendar-errors.xml.h:60
@@ -3699,7 +3903,6 @@ msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Ha realizado cambios a esta cita, pero no los ha guardado."
 
 #: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
-#: composer/mail-composer-errors.xml.h:33
 msgid "Discard Changes"
 msgstr "Descartar cambios"
 
@@ -3729,8 +3932,7 @@ msgstr "¿Quiere enviar invitaciones a los participantes?"
 
 #. calendar:prompt-meeting-invite secondary
 #: calendar/calendar-errors.xml.h:86
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
+msgid "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "Las invitaciones serán enviadas por correo-e a todos los participantes y las "
 "permitirá RSVP."
@@ -3744,8 +3946,7 @@ msgstr "Enviar"
 #. calendar:prompt-send-updated-meeting-info primary
 #: calendar/calendar-errors.xml.h:90
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
-"¿Quiere enviar información de la reunión actualizada a los participantes?"
+msgstr "¿Quiere enviar información de la reunión actualizada a los participantes?"
 
 #. calendar:prompt-send-updated-meeting-info secondary
 #: calendar/calendar-errors.xml.h:92
@@ -3792,8 +3993,7 @@ msgstr "Las tareas de Evolution han terminado inesperadamente."
 #. calendar:tasks-crashed secondary
 #: calendar/calendar-errors.xml.h:110
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
-"Sus tareas no estarán disponibles hasta que Evolution sea iniciado de nuevo."
+msgstr "Sus tareas no estarán disponibles hasta que Evolution sea iniciado de nuevo."
 
 #. calendar:calendar-crashed primary
 #: calendar/calendar-errors.xml.h:112
@@ -3803,10 +4003,63 @@ msgstr "El calendario de Evolution ha terminado inesperadamente."
 #. calendar:calendar-crashed secondary
 #: calendar/calendar-errors.xml.h:114
 msgid "Your calendars will not be available until Evolution is restarted."
+msgstr "Sus calendarios no estarán disponibles hasta que Evolution sea reiniciado."
+
+#. calendar:prompt-delete-calendar primary
+#: calendar/calendar-errors.xml.h:116
+msgid "Delete calendar '{0}'?"
+msgstr "¿Desea borrar el calendario «{0}»?"
+
+#. calendar:prompt-delete-calendar secondary
+#: calendar/calendar-errors.xml.h:118
+msgid "This calendar will be removed permanently."
+msgstr "Este calendario se eliminará permanentemente."
+
+#. calendar:prompt-delete-task-list primary
+#: calendar/calendar-errors.xml.h:120
+msgid "Delete task list '{0}'?"
+msgstr "¿Desea borrar la lista de tareas «{0}»?"
+
+#. calendar:prompt-delete-task-list secondary
+#: calendar/calendar-errors.xml.h:122
+msgid "This task list will be removed permanently."
+msgstr "Esta lista de tareas será eliminada permanentemente."
+
+#. calendar:prompt-send-no-subject-calendar primary
+#: calendar/calendar-errors.xml.h:124
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "¿Seguro que quiere enviar la cita sin un resumen?"
+
+#. calendar:prompt-send-no-subject-calendar secondary
+#: calendar/calendar-errors.xml.h:126
+msgid ""
+"Adding a meaningful Summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+"Añadir una Resumen con significado a su cita dará a sus "
+"destinatarios una idea de qué trata su cita."
+
+#: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+msgid "_Send"
+msgstr "_Enviar"
+
+#. calendar:prompt-send-no-subject-task primary
+#: calendar/calendar-errors.xml.h:129
+msgid "Are you sure you want to send the task without a summary?"
+msgstr "¿Seguro que quiere enviar la tarea mensaje sin un resumen?"
+
+#. calendar:prompt-send-no-subject-task secondary
+#: calendar/calendar-errors.xml.h:131
+msgid ""
+"Adding a meaningful Summary to your task will give your recipients an idea "
+"of what your appointment is about."
 msgstr ""
-"Sus calendarios no estarán disponibles hasta que Evolution sea reiniciado."
+"Añadir un Resumen con significado a su tarea dará a sus "
+"destinatarios una idea de qué trata su cita."
 
-#: calendar/common/authentication.c:48 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Introduzca contraseña"
@@ -3815,15 +4068,15 @@ msgstr "Introduzca contraseña"
 msgid "Split Multi-Day Events:"
 msgstr "Dividir acontecimientos de días múltiples:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1356
-#: calendar/conduits/calendar/calendar-conduit.c:1357
+#: calendar/conduits/calendar/calendar-conduit.c:1359
+#: calendar/conduits/calendar/calendar-conduit.c:1360
 #: calendar/conduits/todo/todo-conduit.c:879
 #: calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "No se ha podido iniciar el servidor evolution-data-server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
 #: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1471
 msgid "Could not read pilot's Calendar application block"
 msgstr "No se pudo leer información de la aplicación de calendario del Pilot"
 
@@ -3836,112 +4089,97 @@ msgstr "Prioridad predeterminada:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "No se pudo leer los datos de la aplicación ToDo del Pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Calendario y tareas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:1079
-msgid "Calendars"
-msgstr "Calendarios"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure su zona horaria, calendario y lista de tareas aquí"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuto"
+msgstr[1] "minutos"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Calendario y tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Control de configuración del calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visor de mensajes de planificación del calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de calendario/tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Componente de Calendario de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Tasks component"
-msgstr "Componente de Tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/e-tasks.c:1199 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:889
-#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:709
-#: camel/providers/groupwise/camel-gw-listener.c:332
-msgid "Tasks"
-msgstr "Tareas"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/dialogs/event-editor.c:138 calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "Cita"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "_Calendars"
-msgstr "_Calendarios"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Appointment Title"
+msgstr "Título de la cita"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tareas"
+#. End time
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: plugins/itip-formatter/itip-view.c:830
+msgid "End time:"
+msgstr "Hora de fin:"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Servicio de notificación por alarma del Calendario de Evolution"
+#. Location
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/e-itip-control.c:1118 plugins/itip-formatter/itip-view.c:813
+msgid "Location:"
+msgstr "Lugar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
-msgid "Starting:"
-msgstr "Inicio:"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "Snooze _time:"
+msgstr "_Posponer el aviso:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
-msgid "Ending:"
-msgstr "Finalización:"
+#. Start time
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: plugins/itip-formatter/itip-view.c:821
+msgid "Start time:"
+msgstr "Hora de inicio:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
-msgid "Evolution Alarm"
-msgstr "Alarma de Evolution"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11
+#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22 ui/evolution.xml.h:38
+msgid "_Edit"
+msgstr "_Editar"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
-#, c-format
-msgid "Alarm on %s"
-msgstr "Alarmas en %s"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
+msgid "_Snooze"
+msgstr "_Posponer"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-msgid "Snooze _time (minutes):"
-msgstr "_Posponer el aviso (minutos):"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
+msgid "description of appointment"
+msgstr "descripción de la cita"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "_Edit appointment"
-msgstr "_Editar cita"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
+msgid "end-time"
+msgstr "hora de fin"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "_Snooze"
-msgstr "_Posponer"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
+msgid "location"
+msgstr "lugar"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
+msgid "start-time"
+msgstr "hora de inicio"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:864
 msgid "Dismiss"
 msgstr "Rechazar"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:865
 msgid "Dismiss All"
 msgstr "Rechazar todas"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:947
+msgid "No summary available."
+msgstr "No hay resumen disponible."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:956
+#: calendar/gui/alarm-notify/alarm-queue.c:958
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:992
+#: calendar/gui/alarm-notify/alarm-queue.c:966
+msgid "No location information available."
+msgstr "No hay información del lugar disponible."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:982
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3951,15 +4189,15 @@ msgid ""
 msgstr ""
 "Alarma el %s\n"
 "%s\n"
-"Empezando a las %s\n"
-"Terminando a las %s"
+"Empieza a las %s\n"
+"Termina a las %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1092
-#: calendar/gui/alarm-notify/alarm-queue.c:1116
+#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1108
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1096
+#: calendar/gui/alarm-notify/alarm-queue.c:1088
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3971,7 +4209,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrará un diálogo de recordatorio normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1114
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3988,10 +4226,14 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1136
+#: calendar/gui/alarm-notify/alarm-queue.c:1128
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Servicio de notificación por alarma del Calendario de Evolution"
+
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "No se pudo inicializar Bonobo"
@@ -4089,82 +4331,61 @@ msgid "Show where events end in week and month views"
 msgstr "Mostrar dónde terminan los eventos en las vistas de semana y mes"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "The url template to use as a free/busy data fallback"
+msgstr "La plantilla de la url que se usará como datos de disponibilidad en caso de fallo"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Time last alarm ran"
 msgstr "Hora en que la última alarma sonó"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Units for determining when to hide tasks"
 msgstr "Unidades para determinar cuándo ocultar tareas"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Units of default reminder"
 msgstr "Unidades del recordatorio predeterminado"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Weekday the week starts on"
 msgstr "La semana empieza el día"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether or not to use the notification tray for display alarms"
-msgstr ""
-"Indica si se debe usar o no la bandeja de notificación para mostrar alarmas"
+msgstr "Indica si se debe usar o no la bandeja de notificación para mostrar alarmas"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Indica si debe pedir confirmación al borrar una cita"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Indica si debe pedir confirmación cuando de compacta una carpeta"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to hide completed tasks"
 msgstr "Indica si debe ocultar las áreas terminadas"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to set a default reminder for events"
-msgstr ""
-"Indica si debe establecer un recordatorio predeterminado para los eventos"
+msgstr "Indica si debe establecer un recordatorio predeterminado para los eventos"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show times in 24h format instead of using am/pm"
-msgstr ""
-"Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
+msgstr "Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Whether to show week numbers in date navigator"
-msgstr ""
-"Indica si debe mostrar los números de la semana en el navegador de fechas"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "El resumen contiene"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "La descripción contiene"
+msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas"
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "El comentario contiene"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "La ubicación contiene"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "No coincidente"
-
-#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:564
-#: calendar/gui/dialogs/select-source-dialog.c:112
-#: calendar/gui/gnome-cal.c:1859
-#: camel/providers/groupwise/camel-gw-listener.c:331
-#: camel/providers/groupwise/camel-gw-listener.c:361
+#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:568
+#: calendar/gui/dialogs/calendar-setup.c:362 calendar/gui/gnome-cal.c:1925
+#: plugins/groupwise-account-setup/camel-gw-listener.c:382
+#: plugins/groupwise-account-setup/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/calendar-commands.c:352
+#: calendar/gui/calendar-commands.c:355
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4174,187 +4395,147 @@ msgstr ""
 "antiguos que el tiempo seleccionado. Si continúa, no podrá recuperar esos "
 "eventos."
 
-#: calendar/gui/calendar-commands.c:358
+#: calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "Purgar eventos anteriores a"
 
-#: calendar/gui/calendar-commands.c:363
+#: calendar/gui/calendar-commands.c:366
 #: calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
+#: plugins/calendar-http/calendar-http.c:265
 msgid "days"
 msgstr "días"
 
-#: calendar/gui/calendar-commands.c:432
-msgid "%A %d %B %Y"
-msgstr "%A, %d de %B de %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:519
-#: calendar/gui/e-day-view-top-item.c:714 calendar/gui/e-day-view.c:1588
-#: calendar/gui/e-week-view-main-item.c:329
-msgid "%a %d %b"
-msgstr "%a, %d de %b"
-
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:521
-#: calendar/gui/calendar-component.c:526 calendar/gui/calendar-component.c:528
-msgid "%a %d %b %Y"
-msgstr "%a, %d de %b de %Y"
-
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
-msgid "%d %B %Y"
-msgstr "%d de %B de %Y"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:465
-#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
-msgid "%d %B"
-msgstr "%d de %B"
-
-#: calendar/gui/calendar-component.c:370
-#, c-format
-msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr "El calendario «%s» será eliminado. ¿Seguro que quiere continuar?"
-
-#: calendar/gui/calendar-component.c:426
+#: calendar/gui/calendar-component.c:384
+#: calendar/gui/dialogs/calendar-setup.c:442
 msgid "New Calendar"
 msgstr "Calendario nuevo"
 
-#: calendar/gui/calendar-component.c:516
-msgid "%A %d %b %Y"
-msgstr "%a, %d de %b de %Y"
-
-#: calendar/gui/calendar-component.c:540 calendar/gui/calendar-component.c:547
-#: calendar/gui/calendar-component.c:553 calendar/gui/calendar-component.c:555
-msgid "%d %b %Y"
-msgstr "%d de %B de %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/calendar-component.c:545
-#: calendar/gui/e-day-view-top-item.c:718 calendar/gui/e-day-view.c:1604
-#: calendar/gui/e-week-view-main-item.c:343
-msgid "%d %b"
-msgstr "%d de %b"
-
-#: calendar/gui/calendar-component.c:635
+#: calendar/gui/calendar-component.c:701
 msgid "Failed upgrading calendars."
 msgstr "Fallo al actualizar calendarios."
 
-#: calendar/gui/calendar-component.c:931
+#: calendar/gui/calendar-component.c:997
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "no se pudo abrir el calendario «%s» para crear eventos y reuniones"
 
-#: calendar/gui/calendar-component.c:947
+#: calendar/gui/calendar-component.c:1013
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay un calendario disponible para crear eventos y reuniones"
 
-#: calendar/gui/calendar-component.c:1245
+#: calendar/gui/calendar-component.c:1123
+msgid "Calendar Source Selector"
+msgstr "Selector de origen del calendario"
+
+#: calendar/gui/calendar-component.c:1148
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr "Calendarios"
+
+#: calendar/gui/calendar-component.c:1314
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: calendar/gui/calendar-component.c:1246
+#: calendar/gui/calendar-component.c:1315
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: calendar/gui/calendar-component.c:1247
+#: calendar/gui/calendar-component.c:1316
 msgid "Create a new appointment"
 msgstr "Crear una cita nueva"
 
-#: calendar/gui/calendar-component.c:1253
+#: calendar/gui/calendar-component.c:1322
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: calendar/gui/calendar-component.c:1254
+#: calendar/gui/calendar-component.c:1323
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: calendar/gui/calendar-component.c:1255
+#: calendar/gui/calendar-component.c:1324
 msgid "Create a new meeting request"
 msgstr "Crear una solicitud de reunión nueva"
 
-#: calendar/gui/calendar-component.c:1261
+#: calendar/gui/calendar-component.c:1330
 msgid "New all day appointment"
 msgstr "Cita para todo el día nueva"
 
-#: calendar/gui/calendar-component.c:1262
+#: calendar/gui/calendar-component.c:1331
 msgid "All Day A_ppointment"
 msgstr "_Cita para todo el día"
 
-#: calendar/gui/calendar-component.c:1263
+#: calendar/gui/calendar-component.c:1332
 msgid "Create a new all-day appointment"
 msgstr "Crear una cita nueva para todo el día"
 
-#: calendar/gui/calendar-component.c:1269
+#: calendar/gui/calendar-component.c:1338
 msgid "New calendar"
 msgstr "Calendario nuevo"
 
-#: calendar/gui/calendar-component.c:1270
+#: calendar/gui/calendar-component.c:1339
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: calendar/gui/calendar-component.c:1271
+#: calendar/gui/calendar-component.c:1340
 msgid "Create a new calendar"
 msgstr "Crear un calendario nuevo"
 
-#: calendar/gui/calendar-offline-handler.c:192
-#, c-format
-msgid "backend_go_offline(): %s"
-msgstr "backend_go_offline(): %s"
-
-#: calendar/gui/calendar-offline-handler.c:215
-#, c-format
-msgid "backend_go_online(): %s"
-msgstr "backend_go_online(): %s"
-
-#: calendar/gui/calendar-view-factory.c:118
+#: calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "Vista diaria"
 
-#: calendar/gui/calendar-view-factory.c:121
+#: calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "Vista de la semana laboral"
 
-#: calendar/gui/calendar-view-factory.c:124
+#: calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "Vista semanal"
 
-#: calendar/gui/calendar-view-factory.c:127
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "Vista mensual"
 
-#: calendar/gui/comp-editor-factory.c:409
+#: calendar/gui/cal-search-bar.c:49
+msgid "Summary contains"
+msgstr "El resumen contiene"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Description contains"
+msgstr "La descripción contiene"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Comment contains"
+msgstr "El comentario contiene"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Location contains"
+msgstr "La ubicación contiene"
+
+#: calendar/gui/cal-search-bar.c:350
+msgid "Unmatched"
+msgstr "No coincidente"
+
+#: calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "Error al abrir el calendario"
 
-#: calendar/gui/comp-editor-factory.c:420
+#: calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr "Método no soportado al abrir el calendario"
 
-#: calendar/gui/comp-editor-factory.c:426
+#: calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado para abrir el calendario"
 
-#: calendar/gui/comp-editor-factory.c:474
-#, c-format
-msgid "open_client(): %s"
-msgstr "open_client(): %s"
+#: calendar/gui/comp-editor-factory.c:437 shell/e-shell.c:1259
+msgid "Unknown error"
+msgstr "Error desconocido"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Alarm</b>\t"
-msgstr "<b>Alarma</b>\t"
+msgid "<b>Alarm</b>"
+msgstr "<b>Alarma</b>"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Options</b>"
@@ -4445,7 +4626,8 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
+#: plugins/calendar-http/calendar-http.c:264
 msgid "hours"
 msgstr "horas"
 
@@ -4454,10 +4636,26 @@ msgid "minute(s)"
 msgstr "minuto(s)"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "option menu to choose alarm action"
+msgstr "opción del menú para elegir la acción de la alarma"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:29
+msgid "option menu to choose alarm relative"
+msgstr "opción de menú para elegir la alarma relativa"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:30
+msgid "option menu to choose alarm time"
+msgstr "opción del menú para elegir la hora de la alarma"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:31
+msgid "option menu to choose alarm value units"
+msgstr "opción del menú para elegir las unidades del valor de la alarma"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:32
 msgid "start of appointment"
 msgstr "comienzo de cita"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:192
+#: calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "Acción/Disparador"
 
@@ -4469,36 +4667,98 @@ msgstr "Aña_dir"
 msgid "Alarms"
 msgstr "Alarmas"
 
+#: calendar/gui/dialogs/calendar-setup.c:284
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Copiar el contenido del calendario localmente para operación desconectada"
+
+#: calendar/gui/dialogs/calendar-setup.c:336
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "C_olor:"
+
+#: calendar/gui/dialogs/calendar-setup.c:373
+msgid "Tasks List"
+msgstr "Lista de tareas"
+
+#: calendar/gui/dialogs/calendar-setup.c:440
+msgid "Calendar Properties"
+msgstr "Propiedades del calendario"
+
+#: calendar/gui/dialogs/calendar-setup.c:506
+msgid "Task List Properties"
+msgstr "Propiedades de lista de tareas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Añadir calendario"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Task List"
+msgstr "Añadir lista de tareas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:103
+msgid "Pick a color"
+msgstr "Elija un color"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Añadir calendario"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Task List"
+msgstr "_Añadir lista de tareas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#: plugins/calendar-http/calendar-http.c:248
+msgid "_Refresh:"
+msgstr "_Refrescar:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: plugins/calendar-http/calendar-http.c:120
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
+#: plugins/calendar-http/calendar-http.c:266
+msgid "weeks"
+msgstr "semanas"
+
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:470
+#: mail/em-composer-prefs.c:678 mail/em-composer-prefs.c:945
+#: plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Activado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "¿Seguro que quiere eliminar esta URL?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:729
+#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+msgid "Remove"
+msgstr "Eliminar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "No eliminar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
-#: mail/em-composer-prefs.c:684
+#: calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: calendar/gui/dialogs/cal-prefs-dialog.c:853 mail/em-account-prefs.c:317
+#: mail/em-account-prefs.c:345 mail/em-account-prefs.c:376
+#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
+#: mail/em-composer-prefs.c:685
 msgid "Disable"
 msgstr "Desactivar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
-#: mail/em-composer-prefs.c:684
+#: calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: calendar/gui/dialogs/cal-prefs-dialog.c:855 mail/em-account-prefs.c:317
+#: mail/em-account-prefs.c:345 mail/em-account-prefs.c:378
+#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
+#: mail/em-composer-prefs.c:685
 msgid "Enable"
 msgstr "Activar"
 
@@ -4527,283 +4787,228 @@ msgid "<b>Alerts</b>"
 msgstr "<b>Alertas</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "<b>Default Free/Busy Server</b>"
+msgstr "<b>Servidor de disponibilidad predeterminado</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>General</b>"
 msgstr "<b>General</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<b>Publishing</b>"
+msgstr "<b>Publicación</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Task List</b>"
 msgstr "<b>Lista de tareas</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Time</b>"
 msgstr "<b>Hora</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Work Week</b>"
 msgstr "<b>Semana laboral</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#, no-c-format
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr "<i>%u y %d serán reemplazadas por un usuario y dominio desde la dirección de correo-e.</i>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Calendar and Tasks Settings"
 msgstr "Configuración de calendario y de tareas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Color for overdue tasks"
 msgstr "Color para las tareas vencidas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Color for tasks due today"
 msgstr "Color para las tareas que vencen hoy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "La jornada _acaba a las:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Days"
 msgstr "días"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Display"
 msgstr "Mostrar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:76
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Activar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Free/Busy Publishing"
-msgstr "Publicación de disponibilidad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Free/Busy"
+msgstr "Disponibilidad"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:751
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/recurrence-page.c:1031
+#: calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Viernes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1034
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/recurrence-page.c:1027
+#: calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Lunes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "S_un"
 msgstr "_Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:752
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1032
+#: calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Sábado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Sh_ow a reminder"
 msgstr "M_ostrar un recordatorio"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:746
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "T_asks due today:"
 msgstr "Ta_reas que vencen hoy:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "T_hu"
 msgstr "_Jue"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:750
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "Template:"
+msgstr "Plantilla:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/recurrence-page.c:1030
+#: calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Jueves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Time format:"
 msgstr "Formato de la hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1035
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:1028
+#: calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Martes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "W_eek starts:"
 msgstr "La _semana empieza en:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/recurrence-page.c:1029
+#: calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Work days:"
 msgstr "Días laborables:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Add URL"
 msgstr "_Añadir URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ación al borrar elementos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Day begins:"
 msgstr "La jornada laboral _comienza a las:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
-#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22
-msgid "_Edit"
-msgstr "_Editar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Fri"
 msgstr "_Vie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas terminadas tras"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Overdue tasks:"
 msgstr "Tareas fuera de pla_zo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Sat"
 msgstr "_Sáb"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Show appointment end times in week and month views"
-msgstr ""
-"Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
+msgstr "Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Time divisions:"
 msgstr "Divisiones de _hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Tue"
 msgstr "_Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Wed"
 msgstr "M_ié"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Debe especificar una ubicación de la que obtener el calendario."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "La ubicación fuente «%s» no está bien formada."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "La ubicación fuente «%s» no es una fuente webcal."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "El origen con nombre «%s» ya existe en el grupo seleccionado"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"El grupo «%s» es remoto. Debe especificar una ubicación de la que obtener el "
-"calendario"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Añadir calendario"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Task List"
-msgstr "Añadir lista de tareas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "option menu to choose reminder units"
+msgstr "opción del menú para elegir las unidades de recordatorios"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_olor:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Elija un color"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Añadir calendario"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Task List"
-msgstr "_Añadir lista de tareas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Refrescar:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Tipo:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
-msgid "weeks"
-msgstr "semanas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+msgid "option menu to choose time units"
+msgstr "opción del menú para elegir las unidades de tiempo"
 
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
@@ -4849,75 +5054,100 @@ msgstr "%s  Ha realizado cambios. ¿Olvido estos cambios y actualizo el editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Error de validación: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " a "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(Completado "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Completado "
+#: calendar/gui/dialogs/comp-editor.c:279
+msgid "Could not update object"
+msgstr "No se pudo actualizar el objeto"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Vence "
+#: calendar/gui/dialogs/comp-editor.c:417 composer/e-msg-composer.c:2315
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> archivo adjunto"
+msgstr[1] "<b>%d</b> archivos adjuntos"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Vence "
+#: calendar/gui/dialogs/comp-editor.c:470 composer/e-msg-composer.c:2344
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Ocultar barra de _adjuntos (soltar adjuntos aquí)"
 
-#: calendar/gui/dialogs/comp-editor.c:264
-msgid "Could not update object"
-msgstr "No se pudo actualizar el objeto"
+#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:517 composer/e-msg-composer.c:2347
+#: composer/e-msg-composer.c:3466
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Mostrar barra de _adjuntos (soltar adjuntos aquí)"
 
-#: calendar/gui/dialogs/comp-editor.c:878
-#: calendar/gui/dialogs/comp-editor.c:915
+#: calendar/gui/dialogs/comp-editor.c:1046
+#: calendar/gui/dialogs/comp-editor.c:1089
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: calendar/gui/dialogs/comp-editor.c:883
-#: calendar/gui/dialogs/comp-editor.c:920
+#: calendar/gui/dialogs/comp-editor.c:1052
+#: calendar/gui/dialogs/comp-editor.c:1095
+#, c-format
+msgid "Meeting - %s"
+msgstr "Reunión - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:1054
+#: calendar/gui/dialogs/comp-editor.c:1097
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:886
-#: calendar/gui/dialogs/comp-editor.c:923
+#: calendar/gui/dialogs/comp-editor.c:1058
+#: calendar/gui/dialogs/comp-editor.c:1101
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tarea asignada - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:1060
+#: calendar/gui/dialogs/comp-editor.c:1103
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:889
-#: calendar/gui/dialogs/comp-editor.c:926
+#: calendar/gui/dialogs/comp-editor.c:1063
+#: calendar/gui/dialogs/comp-editor.c:1106
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:936
+#: calendar/gui/dialogs/comp-editor.c:1074
+#: calendar/gui/dialogs/comp-editor.c:1116
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1302
-#: calendar/gui/dialogs/comp-editor.c:1335
-#: calendar/gui/dialogs/comp-editor.c:1359
+#: calendar/gui/dialogs/comp-editor.c:1548
+#: calendar/gui/dialogs/comp-editor.c:1581
+#: calendar/gui/dialogs/comp-editor.c:1605
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: calendar/gui/dialogs/comp-editor.c:1383
+#: calendar/gui/dialogs/comp-editor.c:1629
 msgid "Unable to use current version!"
 msgstr "Imposible obtener versión actual."
 
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Error de validación: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
+msgid " (Completed "
+msgstr "(Completado "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
+msgid "Completed "
+msgstr "Completado "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
+msgid " (Due "
+msgstr " (Vence "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
+msgid "Due "
+msgstr "Vence "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "No se pudo abrir el origen"
@@ -4956,8 +5186,7 @@ msgstr "La tarea no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr ""
-"La entrada del diario no pudo ser borrada porque el permiso fue denegado"
+msgstr "La entrada del diario no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -4991,70 +5220,66 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir un delegado"
 
-#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
-msgid "Appointment"
-msgstr "Cita"
-
-#: calendar/gui/dialogs/event-editor.c:162
+#: calendar/gui/dialogs/event-editor.c:147
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:239
-#: calendar/gui/dialogs/event-editor.c:381
+#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:231
+#: calendar/gui/dialogs/event-editor.c:376
 msgid "Scheduling"
 msgstr "Planificación"
 
-#: calendar/gui/dialogs/event-editor.c:176
-#: calendar/gui/dialogs/event-editor.c:242
-#: calendar/gui/dialogs/event-editor.c:384
+#: calendar/gui/dialogs/event-editor.c:166
+#: calendar/gui/dialogs/event-editor.c:234
+#: calendar/gui/dialogs/event-editor.c:379
 msgid "Invitations"
 msgstr "Invitaciones"
 
-#: calendar/gui/dialogs/event-page.c:692
+#: calendar/gui/dialogs/event-page.c:716
 msgid "Event with no start date"
 msgstr "Evento sin fecha de inicio"
 
-#: calendar/gui/dialogs/event-page.c:695
+#: calendar/gui/dialogs/event-page.c:719
 msgid "Event with no end date"
 msgstr "Evento sin fecha de finalización"
 
-#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
+#: calendar/gui/dialogs/event-page.c:885 calendar/gui/dialogs/task-page.c:551
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:865
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End date is wrong"
 msgstr "La fecha de finalización  está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:888
+#: calendar/gui/dialogs/event-page.c:918
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:895
+#: calendar/gui/dialogs/event-page.c:925
 msgid "End time is wrong"
 msgstr "La  hora de finalización  está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:1605
+#: calendar/gui/dialogs/event-page.c:1666
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No se pudo abrir el calendario «%s»."
 
-#: calendar/gui/dialogs/event-page.c:1804
+#: calendar/gui/dialogs/event-page.c:1872
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes de la cita"
 msgstr[1] "%d días antes de la cita"
 
-#: calendar/gui/dialogs/event-page.c:1812
+#: calendar/gui/dialogs/event-page.c:1880
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes de la cita"
 msgstr[1] "%d horas antes de la cita"
 
-#: calendar/gui/dialogs/event-page.c:1820
+#: calendar/gui/dialogs/event-page.c:1888
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -5082,123 +5307,138 @@ msgid "<b>Date and Time</b>"
 msgstr "<b>Fecha y hora</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "<b>Send Options</b>"
+msgstr "<b>Opciones de envío</b>"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
 msgstr "Acontecimiento para _todo el día"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
+msgid "Ad_vanced  send options"
+msgstr "Opciones de envío _avanzadas"
+
+#: calendar/gui/dialogs/event-page.glade.h:10
 msgid "C_ustomize..."
 msgstr "_Personalizar..."
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "Cale_ndario:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Classi_fication:"
 msgstr "Clasi_ficación:"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:355 calendar/gui/e-calendar-table.c:377
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:361 calendar/gui/e-cal-list-view.c:255
+#: calendar/gui/e-cal-model.c:305
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:15
+msgid "Event Description"
+msgstr "Descripción del acontecimiento"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "_Lugar:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:353 calendar/gui/e-calendar-table.c:376
+#: calendar/gui/dialogs/event-page.glade.h:17
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:360 calendar/gui/e-cal-list-view.c:254
+#: calendar/gui/e-cal-model.c:303
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:344 calendar/gui/e-cal-model.c:351
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:359 calendar/gui/e-cal-list-view.c:253
+#: calendar/gui/e-cal-model.c:294 calendar/gui/e-cal-model.c:301
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:19
 msgid "Show time as _busy"
 msgstr "Mostrar hora como _ocupada"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:20
+#: calendar/gui/dialogs/task-page.glade.h:14
 msgid "Su_mmary:"
 msgstr "Resu_men:"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "Esta cita tiene alarmas personalizadas"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: calendar/gui/dialogs/event-page.glade.h:22
 msgid "_Alarm"
 msgstr "_Alarma"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
 msgstr "_Descripción:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/dialogs/event-page.glade.h:24
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/dialogs/event-page.glade.h:25
+#: calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
 #. Put the "None" and "UTC" entries at the top of the combo's list.
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:316
+#: calendar/gui/dialogs/meeting-page.c:296
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:1123
-#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:933
-#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
-#: mail/mail-config.glade.h:103
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
-#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
+#: calendar/gui/e-cal-model-tasks.c:652 calendar/gui/e-itip-control.c:1104
+#: composer/e-msg-composer.c:2122 filter/filter-rule.c:878
+#: mail/em-account-editor.c:675 mail/em-account-editor.c:1269
+#: mail/em-account-prefs.c:431 mail/em-folder-view.c:972
+#: plugins/itip-formatter/itip-formatter.c:1365
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458
+#: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/dialogs/meeting-page.c:449
+#: calendar/gui/dialogs/meeting-page.c:432
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta por más tiempo."
 
-#: calendar/gui/dialogs/meeting-page.c:455
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:470
+#: calendar/gui/dialogs/meeting-page.c:453
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un asistente."
 
-#: calendar/gui/dialogs/meeting-page.c:793
+#: calendar/gui/dialogs/meeting-page.c:778
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
-#: calendar/gui/dialogs/meeting-page.c:797
-#: composer/e-msg-composer-attachment-bar.c:453
+#: calendar/gui/dialogs/meeting-page.c:781
+#: composer/e-msg-composer-attachment-bar.c:440
+#: plugins/shared-folder/properties.glade.h:19
 msgid "_Remove"
 msgstr "_Quitar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:218
+#: calendar/gui/e-meeting-list-view.c:235
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Participantes"
@@ -5234,16 +5474,16 @@ msgid "Member"
 msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:258
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Confirmar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/dialogs/task-editor.c:145
 #: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: calendar/gui/e-meeting-list-view.c:265
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -5257,7 +5497,7 @@ msgid "C_hange Organizer"
 msgstr "Cambiar or_ganizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:415
+#: calendar/gui/e-meeting-time-sel.c:428
 msgid "Con_tacts..."
 msgstr "Con_tactos..."
 
@@ -5266,6 +5506,10 @@ msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:7
+msgid "Organizer"
+msgstr "Organizador"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizador:"
@@ -5308,18 +5552,15 @@ msgstr "Nombre de la lista de tareas"
 
 #: calendar/gui/dialogs/recur-comp.c:51
 msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr ""
-"Está modificando un acontecimiento que se repite, ¿qué quiere modificar?"
+msgstr "Está modificando un acontecimiento que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:55
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Está modificando una tarea que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:59
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr ""
-"Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgstr "Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
@@ -5337,55 +5578,55 @@ msgstr "Esta instancia y las futuras"
 msgid "All Instances"
 msgstr "Todas las instancias"
 
-#: calendar/gui/dialogs/recurrence-page.c:511
+#: calendar/gui/dialogs/recurrence-page.c:493
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene repeticiones que no pueden ser editadas por Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:806
+#: calendar/gui/dialogs/recurrence-page.c:799
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repetición está equivocada"
 
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/recurrence-page.c:910
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/dialogs/recurrence-page.c:978
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "first"
 msgstr "primero"
 
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:972
 msgid "second"
 msgstr "segundo"
 
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:973
 msgid "third"
 msgstr "tercero"
 
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:974
 msgid "fourth"
 msgstr "cuarto"
 
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:975
 msgid "last"
 msgstr "último"
 
-#: calendar/gui/dialogs/recurrence-page.c:1005
+#: calendar/gui/dialogs/recurrence-page.c:998
 msgid "Other Date"
 msgstr "Otra fecha"
 
-#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/dialogs/recurrence-page.c:1026
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/dialogs/recurrence-page.c:1170
+#: calendar/gui/dialogs/recurrence-page.c:1163
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1356
+#: calendar/gui/dialogs/recurrence-page.c:1349
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: calendar/gui/dialogs/recurrence-page.c:2309
+#: calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -5433,24 +5674,13 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "año(s)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
-msgid "Select destination"
-msgstr "Seleccione destino"
-
-#: calendar/gui/dialogs/select-source-dialog.c:110
-msgid "_Destination"
-msgstr "_Destino"
-
-#: calendar/gui/dialogs/select-source-dialog.c:112
-msgid "Task List"
-msgstr "Lista de tareas"
-
-#: calendar/gui/dialogs/task-details-page.c:427
+#: calendar/gui/dialogs/task-details-page.c:410
+#: calendar/gui/dialogs/task-details-page.c:429
 msgid "Completed date is wrong"
 msgstr "La fecha de terminación es errónea"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">Varios\t</span>"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
@@ -5460,44 +5690,45 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
-#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:915
-#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
-#: calendar/gui/print.c:2346
+#: calendar/gui/e-cal-component-preview.c:229
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-tasks.c:345
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
+#: calendar/gui/print.c:2349
 msgid "Completed"
 msgstr "Terminado"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1012
+#: calendar/gui/e-cal-component-preview.c:248
+#: calendar/gui/e-calendar-table.c:381 mail/message-list.c:1011
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
-#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/print.c:2343
+#: calendar/gui/e-cal-component-preview.c:226
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-tasks.c:343
+#: calendar/gui/e-cal-model-tasks.c:656 calendar/gui/e-cal-model-tasks.c:731
+#: calendar/gui/print.c:2346
 msgid "In Progress"
 msgstr "En proceso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1010
+#: calendar/gui/e-cal-component-preview.c:252
+#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1009
 msgid "Low"
 msgstr "Baja"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:943
-#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1011
+#: calendar/gui/e-cal-component-preview.c:250
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:899
+#: mail/message-list.c:1010
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
-#: calendar/gui/e-calendar-table.c:470 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:236
+#: calendar/gui/e-calendar-table.c:454 calendar/gui/e-cal-model-tasks.c:341
+#: calendar/gui/e-cal-model-tasks.c:654 calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "Sin comenzar"
 
@@ -5506,7 +5737,7 @@ msgid "P_ercent complete:"
 msgstr "Porcentaje completado:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:384
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -5526,46 +5757,54 @@ msgstr "E_stado:"
 msgid "_Web Page:"
 msgstr "Página _web:"
 
-#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+#: calendar/gui/dialogs/task-editor.c:136 calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Tarea"
 
-#: calendar/gui/dialogs/task-editor.c:165
-#: calendar/gui/dialogs/task-editor.c:225
-#: calendar/gui/dialogs/task-editor.c:361
+#: calendar/gui/dialogs/task-editor.c:156
+#: calendar/gui/dialogs/task-editor.c:218
+#: calendar/gui/dialogs/task-editor.c:357
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:496
+#: calendar/gui/dialogs/task-page.c:524
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: calendar/gui/dialogs/task-page.c:831
+#: calendar/gui/dialogs/task-page.c:868
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en «%s»."
 
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "<span weight=\"bold\">Basics</span>"
 msgstr "<span weight=\"bold\">Básicos</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr "<span weight=\"bold\">Hora y fecha</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:5
+msgid "Ad_vanced send options"
+msgstr "Opciones de envío a_vanzadas"
+
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "D_escription:"
 msgstr "_Descripción:"
 
-#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Sta_rt date:"
 msgstr "Fecha de ini_cio:"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Task Description"
+msgstr "Descripción de la tarea"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Due date:"
 msgstr "Fecha de _vencimiento:"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -5582,8 +5821,8 @@ msgid "<b>Publishing _Location</b>"
 msgstr "<b>_Dirección de publicación</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Editor"
-msgstr "Editor de información de disponibilidad"
+msgid "Free/Busy Publishing Settings"
+msgstr "Opciones de publicación de disponibilidad"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
@@ -5688,275 +5927,188 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2385
+#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2478
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
 
-#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+#: calendar/gui/e-cal-component-preview.c:155 filter/filter-rule.c:795
 msgid "Untitled"
 msgstr "Sin título"
 
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-cal-component-preview.c:186
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
-#: calendar/gui/e-cal-component-preview.c:194
-#: calendar/gui/e-cal-component-preview.c:205
+#: calendar/gui/e-cal-component-preview.c:193
+#: calendar/gui/e-cal-component-preview.c:204
 msgid "Start Date:"
 msgstr "Fecha de inicio:"
 
-#: calendar/gui/e-cal-component-preview.c:216
+#: calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr "Fecha de vencimiento:"
 
 #. write status
-#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:1151
+#. Status
+#: calendar/gui/e-cal-component-preview.c:222
+#: calendar/gui/e-itip-control.c:1132 plugins/itip-formatter/itip-view.c:838
 msgid "Status:"
 msgstr "Estado:"
 
-#: calendar/gui/e-cal-component-preview.c:247
+#: calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "Prioridad:"
 
-#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
+#: calendar/gui/e-cal-component-preview.c:267
+#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Descripción:"
 
-#: calendar/gui/e-cal-component-preview.c:300
+#: calendar/gui/e-cal-component-preview.c:299
 msgid "Web Page:"
 msgstr "Página web:"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Fecha final"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "Fecha de inicio"
-
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
-msgid "Summary"
-msgstr "Resumen"
-
-#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:449
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:450
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Ocupada"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"La posición geográfica debe ser introducida con el formato: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Sí"
-
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "No"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:357 calendar/gui/e-cal-model.c:360
-#: calendar/gui/e-itip-control.c:1168 calendar/gui/e-itip-control.c:1309
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1763 camel/camel-gpg-context.c:1814
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1402
-#: camel/providers/imap4/camel-imap4-engine.c:1432
-#: camel/providers/imap4/camel-imap4-engine.c:1464
-#: camel/providers/imap4/camel-imap4-engine.c:1506
-#: camel/providers/imap4/camel-imap4-store.c:1223
-#: camel/providers/imap4/camel-imap4-utils.c:457
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1155
-#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: calendar/gui/e-cal-model.c:945
-msgid "Recurring"
-msgstr "Repetición"
-
-#: calendar/gui/e-cal-model.c:947
-msgid "Assigned"
-msgstr "Asignado"
-
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:403
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:404
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:405
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/e-calendar-table.c:406
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:407
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:408
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:409
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:410
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:411
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:412
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:413
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:703 calendar/gui/e-calendar-view.c:658
+#: calendar/gui/e-calendar-table.c:433 calendar/gui/e-cal-model-calendar.c:179
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/e-calendar-table.c:434 calendar/gui/e-cal-model-calendar.c:182
+#: calendar/gui/e-meeting-time-sel.c:412
+msgid "Busy"
+msgstr "Ocupada"
+
+#: calendar/gui/e-calendar-table.c:689 calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:867 calendar/gui/e-calendar-view.c:762
+#: calendar/gui/e-calendar-table.c:868 calendar/gui/e-calendar-view.c:756
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1431 calendar/gui/e-calendar-view.c:1512
-#: mail/em-folder-view.c:899 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-view.c:1064
+#: composer/e-msg-composer.c:1201
+msgid "Save as..."
+msgstr "Guardar como..."
+
+#: calendar/gui/e-calendar-table.c:1151 calendar/gui/e-calendar-view.c:1389
+#: mail/em-folder-view.c:938 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:1044
+#: calendar/gui/e-calendar-table.c:1152
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090
-#: calendar/gui/e-calendar-view.c:1432 calendar/gui/e-calendar-view.c:1518
-#: mail/em-folder-view.c:901 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1153 calendar/gui/e-calendar-view.c:1390
+#: mail/em-folder-view.c:940 mail/em-popup.c:498
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088
-#: calendar/gui/e-calendar-view.c:1410 calendar/gui/e-calendar-view.c:1433
-#: calendar/gui/e-calendar-view.c:1516 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
+#: calendar/gui/e-calendar-table.c:1154 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1391 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079
-#: calendar/gui/e-calendar-view.c:1438 calendar/gui/e-calendar-view.c:1482
+#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1395
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077
-#: calendar/gui/e-calendar-view.c:1439 calendar/gui/e-calendar-view.c:1480
-#: mail/em-folder-tree.c:1020 mail/message-list.c:1702
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
-#: ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1396
+#: composer/e-msg-composer.c:2901 mail/em-folder-tree.c:1036
+#: mail/message-list.c:1712 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086
-#: calendar/gui/e-calendar-view.c:1414 calendar/gui/e-calendar-view.c:1440
-#: calendar/gui/e-calendar-view.c:1514 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1160 calendar/gui/e-calendar-view.c:1373
+#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1164
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1165
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-table.c:1166
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: calendar/gui/e-calendar-table.c:1059
+#: calendar/gui/e-calendar-table.c:1167
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484
-#: mail/em-folder-tree.c:2718 mail/em-folder-view.c:924
+#: calendar/gui/e-calendar-table.c:1171 calendar/gui/e-calendar-view.c:1408
+#: mail/em-folder-tree.c:2758 mail/em-folder-view.c:963
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: calendar/gui/e-calendar-table.c:1064 calendar/gui/e-calendar-table.c:1082
+#: calendar/gui/e-calendar-table.c:1172
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1196 calendar/gui/e-calendar-view.c:1060
-#: composer/e-msg-composer.c:1178
-msgid "Save as..."
-msgstr "Guardar como..."
-
-#: calendar/gui/e-calendar-table.c:1374
+#: calendar/gui/e-calendar-table.c:1323
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pulse aquí para añadir una tarea"
@@ -5966,8 +6118,7 @@ msgstr "Pulse aquí para añadir una tarea"
 msgid "% Complete"
 msgstr "% Terminado"
 
-#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
-#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 mail/mail-send-recv.c:611
 msgid "Complete"
 msgstr "Completo"
 
@@ -5987,92 +6138,153 @@ msgstr "Prioridad"
 msgid "Start date"
 msgstr "Fecha de inicio"
 
+#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-dialogs.glade.h:21
+msgid "Summary"
+msgstr "Resumen"
+
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-view.c:1176
+#: calendar/gui/e-calendar-view.c:1179
 msgid "Moving items"
 msgstr "Moviendo elementos"
 
-#: calendar/gui/e-calendar-view.c:1178
+#: calendar/gui/e-calendar-view.c:1181
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: calendar/gui/e-calendar-view.c:1403 calendar/gui/e-calendar-view.c:1492
+#: calendar/gui/e-calendar-view.c:1364
 msgid "New _Appointment..."
 msgstr "Cit_a nueva..."
 
-#: calendar/gui/e-calendar-view.c:1404 calendar/gui/e-calendar-view.c:1497
+#: calendar/gui/e-calendar-view.c:1365
 msgid "New All Day _Event"
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: calendar/gui/e-calendar-view.c:1405 calendar/gui/e-calendar-view.c:1502
-msgid "New Meeting"
-msgstr "Reunión nueva"
-
-#: calendar/gui/e-calendar-view.c:1406 calendar/gui/e-calendar-view.c:1507
+#: calendar/gui/e-calendar-view.c:1367
 msgid "New Task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/e-calendar-view.c:1420 ui/evolution-calendar.xml.h:26
+#. FIXME: hook in this somehow
+#: calendar/gui/e-calendar-view.c:1377
+msgid "Current View"
+msgstr "Vista actual"
+
+#: calendar/gui/e-calendar-view.c:1379 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Seleccionar _hoy"
 
-#: calendar/gui/e-calendar-view.c:1421
+#: calendar/gui/e-calendar-view.c:1380
 msgid "_Select Date..."
 msgstr "_Seleccionar fecha..."
 
-#: calendar/gui/e-calendar-view.c:1425 ui/evolution-calendar.xml.h:45
+#. TODO: Why is this in a context menu when it applies globally?
+#: calendar/gui/e-calendar-view.c:1385 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la información de disponibilidad"
 
-#: calendar/gui/e-calendar-view.c:1444
+#: calendar/gui/e-calendar-view.c:1401
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendario..."
 
-#: calendar/gui/e-calendar-view.c:1445
+#: calendar/gui/e-calendar-view.c:1402
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendario..."
 
-#: calendar/gui/e-calendar-view.c:1446
+#: calendar/gui/e-calendar-view.c:1403
 msgid "_Schedule Meeting..."
 msgstr "Concertar una _reunión..."
 
-#: calendar/gui/e-calendar-view.c:1447
+#: calendar/gui/e-calendar-view.c:1404
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1452
+#: calendar/gui/e-calendar-view.c:1409
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta repetición _movible"
 
-#: calendar/gui/e-calendar-view.c:1453 calendar/gui/e-calendar-view.c:1485
+#: calendar/gui/e-calendar-view.c:1410
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _repetición"
 
-#: calendar/gui/e-calendar-view.c:1454 calendar/gui/e-calendar-view.c:1486
+#: calendar/gui/e-calendar-view.c:1411
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
-#: calendar/gui/e-calendar-view.c:1488
-msgid "Go to _Today"
-msgstr "Ir a _hoy"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Fecha final"
+
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-meeting-list-view.c:139
+#: calendar/gui/e-meeting-list-view.c:153 calendar/gui/e-meeting-store.c:124
+#: calendar/gui/e-meeting-store.c:159 calendar/gui/e-meeting-store.c:224
+#: mail/em-utils.c:1157 plugins/itip-formatter/itip-formatter.c:249
+#: plugins/itip-formatter/itip-formatter.c:1387
+#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:202
+#: shell/e-component-registry.c:206 widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Desconocido"
 
-#: calendar/gui/e-calendar-view.c:1490
-msgid "_Go to Date..."
-msgstr "_Ir a una fecha..."
+#: calendar/gui/e-cal-model.c:901
+msgid "Recurring"
+msgstr "Repetición"
 
-#: calendar/gui/e-calendar-view.c:1520 ui/evolution.xml.h:35
-msgid "_Settings..."
-msgstr "_Configuración..."
+#: calendar/gui/e-cal-model.c:903
+msgid "Assigned"
+msgstr "Asignado"
+
+#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
+#: calendar/gui/e-meeting-list-view.c:163 calendar/gui/e-meeting-store.c:168
+#: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
+msgid "Yes"
+msgstr "Sí"
+
+#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
+#: calendar/gui/e-meeting-list-view.c:164 calendar/gui/e-meeting-store.c:180
+msgid "No"
+msgstr "No"
+
+#: calendar/gui/e-cal-model-tasks.c:297
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:297
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:299
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:606
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"La posición geográfica debe ser introducida con el formato: \n"
+"\n"
+"45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:115 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
@@ -6082,12 +6294,12 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:125
+#: calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6098,10 +6310,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisiones por minuto"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:748 calendar/gui/e-week-view.c:512
+#: calendar/gui/print.c:841
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:751 calendar/gui/e-week-view.c:515
+#: calendar/gui/print.c:843
+msgid "pm"
+msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -6109,115 +6328,112 @@ msgstr "%02i divisiones por minuto"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:710 calendar/gui/e-day-view.c:1571
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
+#: calendar/gui/e-day-view.c:1494 calendar/gui/e-day-view-top-item.c:715
+#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:583
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:586
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:527
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisiones por minuto"
 
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetición compuesta)"
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada día"
 msgstr[1] "Cada %d días"
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Cada semana"
 msgstr[1] "Cada %d semanas"
 
-#: calendar/gui/e-itip-control.c:798
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Cada semana en"
 msgstr[1] "Cada %d semanas en"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " y "
 
-#: calendar/gui/e-itip-control.c:813
+#: calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "El %s día de "
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "cada mes"
 msgstr[1] "cada %d meses"
 
-#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada año"
 msgstr[1] "Cada %d años"
 
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:829
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "un total de %d vez"
 msgstr[1] " un total de %d veces"
 
-#: calendar/gui/e-itip-control.c:857
+#: calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", terminando en "
 
-#: calendar/gui/e-itip-control.c:881
+#: calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "Empieza"
 
-#: calendar/gui/e-itip-control.c:894
+#: calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "Termina"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:909
 msgid "Due"
 msgstr "Vence "
 
-#: calendar/gui/e-itip-control.c:968 calendar/gui/e-itip-control.c:1025
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "Información de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:985
+#: calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: calendar/gui/e-itip-control.c:1057 calendar/gui/e-itip-control.c:1073
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1038 calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-itip-control.c:1082
+#: plugins/itip-formatter/itip-view.c:285
+#: plugins/itip-formatter/itip-view.c:286
+#: plugins/itip-formatter/itip-view.c:353
+#: plugins/itip-formatter/itip-view.c:354
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1089
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6225,27 +6441,25 @@ msgstr ""
 "<br> Revise la siguiente información y seleccione una acción del menú de "
 "abajo."
 
-#: calendar/gui/e-itip-control.c:1137
-msgid "Location:"
-msgstr "Lugar:"
-
-#: calendar/gui/e-itip-control.c:1156 calendar/gui/e-meeting-list-view.c:158
-#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
-#: calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:175
+#: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
+#: calendar/gui/itip-utils.c:422 plugins/itip-formatter/itip-formatter.c:1378
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:425
+#: plugins/itip-formatter/itip-formatter.c:1381
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-meeting-list-view.c:159
-#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:176
+#: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
+#: plugins/itip-formatter/itip-formatter.c:1384
 msgid "Declined"
 msgstr "Rechazado"
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1229
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
@@ -6253,267 +6467,266 @@ msgstr ""
 "La reunión ha sido cancelada, sin embargo no pudo encontrarse en sus "
 "calendarios"
 
-#: calendar/gui/e-itip-control.c:1250
-msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
+#: calendar/gui/e-itip-control.c:1231
+msgid "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 "La tarea ha sido cancelada, sin embargo no pudo encontrarse en sus listas de "
 "tareas"
 
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado información de reunión."
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "Información de reunió"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1317
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita la presencia de %s en una reunión."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> solicita su presencia en una reunión."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1345
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reunión existente."
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "Actualización de reunión"
 
-#: calendar/gui/e-itip-control.c:1350
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la última información de la reunión."
 
-#: calendar/gui/e-itip-control.c:1351
+#: calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "Solicitud de actualización de la reunión"
 
-#: calendar/gui/e-itip-control.c:1358
+#: calendar/gui/e-itip-control.c:1339
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ha contestado a la solicitud de reunión."
 
-#: calendar/gui/e-itip-control.c:1359
+#: calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1366
+#: calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha cancelado una reunión."
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "Cancelación de reunión"
 
-#: calendar/gui/e-itip-control.c:1377 calendar/gui/e-itip-control.c:1454
-#: calendar/gui/e-itip-control.c:1494
+#: calendar/gui/e-itip-control.c:1358 calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1475
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
 
-#: calendar/gui/e-itip-control.c:1378
+#: calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ha publicado la información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pide a %s que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> le pide que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1422
+#: calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea añadirse a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1427
+#: calendar/gui/e-itip-control.c:1408
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quiere recibir la última información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1428
+#: calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "Solicitud de actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1416
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ha contestado a una asignación de tarea."
 
-#: calendar/gui/e-itip-control.c:1436
+#: calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1443
+#: calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "Cancelación de tarea"
 
-#: calendar/gui/e-itip-control.c:1455
+#: calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: calendar/gui/e-itip-control.c:1479
+#: calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ha publicado la información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1480
+#: calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pide su información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1485
+#: calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "Solicitud de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1489
+#: calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ha contestado a una solicitud de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1490
+#: calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1495
+#: calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: calendar/gui/e-itip-control.c:1570
+#: calendar/gui/e-itip-control.c:1551
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: calendar/gui/e-itip-control.c:1629
+#: calendar/gui/e-itip-control.c:1610
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sólo contiene solicitudes no soportadas."
 
-#: calendar/gui/e-itip-control.c:1660
+#: calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de calendario válido"
 
-#: calendar/gui/e-itip-control.c:1692
+#: calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: calendar/gui/e-itip-control.c:1926
+#: calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "El objeto es inválido y no puede ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1947
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
-#: calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1959
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "El estado de asistencia no pudo ser actualizado a causa de un estado "
 "inválido\n"
 
-#: calendar/gui/e-itip-control.c:1993
+#: calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1996
+#: calendar/gui/e-itip-control.c:1979
+#: plugins/itip-formatter/itip-formatter.c:844
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"El estado de asistencia no puede ser actualizado porque no existe el elemento"
+msgstr "El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
-#: calendar/gui/e-itip-control.c:2023
+#: calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr "Eliminación terminada"
 
-#: calendar/gui/e-itip-control.c:2046 calendar/gui/e-itip-control.c:2094
+#: calendar/gui/e-itip-control.c:2029 calendar/gui/e-itip-control.c:2077
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: calendar/gui/e-itip-control.c:2048 calendar/gui/e-itip-control.c:2098
+#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2081
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo ser enviado.\n"
 
-#: calendar/gui/e-itip-control.c:2178
+#: calendar/gui/e-itip-control.c:2161
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
-#: calendar/gui/e-itip-control.c:2249
+#: calendar/gui/e-itip-control.c:2232
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:2277
+#: calendar/gui/e-itip-control.c:2260
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:2278
+#: calendar/gui/e-itip-control.c:2261
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: calendar/gui/e-itip-control.c:2279
+#: calendar/gui/e-itip-control.c:2262
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:2308
+#: calendar/gui/e-itip-control.c:2291
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:2336
+#: calendar/gui/e-itip-control.c:2319
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:2364
+#: calendar/gui/e-itip-control.c:2347
 msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
-#: calendar/gui/e-itip-control.c:2392 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
+#: calendar/gui/e-itip-control.c:2375 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:408 mail/mail-send-recv.c:460
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
@@ -6559,6 +6772,11 @@ msgstr "fecha de inicio"
 msgid "Chair Persons"
 msgstr "Presidencia"
 
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:124
+msgid "Required Participants"
+msgstr "Participantes requeridos"
+
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
@@ -6567,153 +6785,153 @@ msgstr "Participantes opcionales"
 msgid "Resources"
 msgstr "Recursos"
 
-#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
-#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:99
+#: calendar/gui/e-meeting-store.c:116 calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
-#: calendar/gui/e-meeting-store.c:109
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:101
+#: calendar/gui/e-meeting-store.c:118
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
-#: calendar/gui/e-meeting-store.c:111
+#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:103
+#: calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
-#: calendar/gui/e-meeting-store.c:113
+#: calendar/gui/e-meeting-list-view.c:138 calendar/gui/e-meeting-store.c:105
+#: calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "Sala"
 
-#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
-#: calendar/gui/e-meeting-store.c:142
+#: calendar/gui/e-meeting-list-view.c:149 calendar/gui/e-meeting-store.c:134
+#: calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "Presidente"
 
-#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
-#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
+#: calendar/gui/e-meeting-list-view.c:150 calendar/gui/e-meeting-store.c:136
+#: calendar/gui/e-meeting-store.c:153 calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "Participante requerido"
 
-#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
-#: calendar/gui/e-meeting-store.c:146
+#: calendar/gui/e-meeting-list-view.c:151 calendar/gui/e-meeting-store.c:138
+#: calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
-#: calendar/gui/e-meeting-store.c:148
+#: calendar/gui/e-meeting-list-view.c:152 calendar/gui/e-meeting-store.c:140
+#: calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "No participan"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
-#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
+#: calendar/gui/e-meeting-list-view.c:174 calendar/gui/e-meeting-store.c:186
+#: calendar/gui/e-meeting-store.c:209 calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "Necesita acción"
 
-#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-list-view.c:177 calendar/gui/e-meeting-store.c:192
+#: calendar/gui/e-meeting-store.c:215 calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Provisional"
 
-#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
-#: calendar/gui/e-meeting-store.c:208
+#: calendar/gui/e-meeting-list-view.c:178 calendar/gui/e-meeting-store.c:194
+#: calendar/gui/e-meeting-store.c:217
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
+#: calendar/gui/e-meeting-store.c:198 calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "En proceso"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2069
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2102 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:413 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:401
+#: calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Sin información"
 
-#: calendar/gui/e-meeting-time-sel.c:432
+#: calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "O_pciones"
 
-#: calendar/gui/e-meeting-time-sel.c:449
+#: calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:507
+#: calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Auto-seleccionar"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:557
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2104
+#: calendar/gui/e-meeting-time-sel-item.c:444
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
+#: calendar/gui/e-meeting-time-sel.c:2137
+#: calendar/gui/e-meeting-time-sel-item.c:448 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
+#: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2262
+#: calendar/gui/e-tasks.c:734 calendar/gui/gnome-cal.c:2429
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6722,50 +6940,125 @@ msgstr ""
 "Error en %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:792
+#: calendar/gui/e-tasks.c:782
 msgid "Loading tasks"
 msgstr "Cargando tareas"
 
-#: calendar/gui/e-tasks.c:874
+#: calendar/gui/e-tasks.c:864
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
 
-#: calendar/gui/e-tasks.c:1071
+#: calendar/gui/e-tasks.c:1061
 msgid "Completing tasks..."
 msgstr "Terminando tareas..."
 
-#: calendar/gui/e-tasks.c:1094
+#: calendar/gui/e-tasks.c:1084
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados..."
 
-#: calendar/gui/e-tasks.c:1121
+#: calendar/gui/e-tasks.c:1111
 msgid "Expunging"
 msgstr "Compactando"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/e-tasks.c:1189
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/print.c:1822 calendar/gui/tasks-component.c:408
+#: calendar/gui/tasks-component.c:881 calendar/gui/tasks-control.c:410
+#: calendar/importers/icalendar-importer.c:83
+#: calendar/importers/icalendar-importer.c:701
+#: plugins/groupwise-account-setup/camel-gw-listener.c:383
+msgid "Tasks"
+msgstr "Tareas"
+
+#: calendar/gui/e-timezone-entry.c:133
+msgid "Timezone Button"
+msgstr "Botón de zona horaria "
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:329 calendar/gui/print.c:1501
+msgid "%d %B"
+msgstr "%d de %B"
+
+#: calendar/gui/gnome-cal.c:718
 msgid "Updating query"
 msgstr "Actualizando consulta"
 
-#: calendar/gui/gnome-cal.c:2039
+#. bonobo displays this string so it must be in locale
+#: calendar/gui/gnome-cal.c:2040 widgets/menus/gal-view-menus.c:351
+msgid "Custom View"
+msgstr "Vista personalizada"
+
+#: calendar/gui/gnome-cal.c:2041
+msgid "Save Custom View"
+msgstr "Guardar vista personalizada"
+
+#: calendar/gui/gnome-cal.c:2046 widgets/menus/gal-view-menus.c:373
+msgid "Define Views..."
+msgstr "Definir vistas..."
+
+#: calendar/gui/gnome-cal.c:2206
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: calendar/gui/gnome-cal.c:2058
+#: calendar/gui/gnome-cal.c:2225
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tareas de %s"
 
-#: calendar/gui/gnome-cal.c:2151
+#: calendar/gui/gnome-cal.c:2318
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: calendar/gui/gnome-cal.c:3120
+#: calendar/gui/gnome-cal.c:3286
 msgid "Purging"
 msgstr "Compactando"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Calendario y tareas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure su zona horaria, calendario y lista de tareas aquí"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Calendario y tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Control de configuración del calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor de mensajes de planificación del calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de calendario/tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "Componente de Calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Tasks component"
+msgstr "Componente de Tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "_Calendars"
+msgstr "_Calendarios"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tareas"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -6876,7 +7169,7 @@ msgstr "Información de iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un asistente del acontecimiento."
 
-#: calendar/gui/migration.c:150
+#: calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6888,7 +7181,7 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: calendar/gui/migration.c:154
+#: calendar/gui/migration.c:155
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6900,334 +7193,331 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: calendar/gui/migration.c:380
+#: calendar/gui/migration.c:381
 msgid "Birthdays & Anniversaries"
 msgstr "Cumpleaños y aniversarios"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:466 calendar/gui/migration.c:548
+#: calendar/gui/migration.c:479 calendar/gui/migration.c:572
 msgid "On The Web"
 msgstr "En la web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:712 calendar/gui/migration.c:864
+#: calendar/gui/migration.c:738 calendar/gui/migration.c:905
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"No es posible migrar la configuración antigua desde evolution/config.xmldb"
+msgstr "No es posible migrar la configuración antigua desde evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:741
+#: calendar/gui/migration.c:767
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "No se pudo migrar el calendario «%s»"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:893
+#: calendar/gui/migration.c:934
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "No es posible migrar las tareas en «%s»"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:495
+#: calendar/gui/print.c:498
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Th"
 msgstr "Ju"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Fr"
 msgstr "Vi"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1914
+#: calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Día seleccionado (%a %d de %b de %Y)"
 
-#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
+#: calendar/gui/print.c:1942 calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a %d de %b"
 
-#: calendar/gui/print.c:1940
+#: calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
-#: calendar/gui/print.c:1947
+#: calendar/gui/print.c:1947 calendar/gui/print.c:1949
+#: calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %d de %b de %Y"
 
-#: calendar/gui/print.c:1951
+#: calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1959
+#: calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1966
+#: calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Año seleccionado (%Y)"
 
-#: calendar/gui/print.c:2356
+#: calendar/gui/print.c:2359
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: calendar/gui/print.c:2373
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: calendar/gui/print.c:2385
+#: calendar/gui/print.c:2388
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: calendar/gui/print.c:2397
+#: calendar/gui/print.c:2400
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2411
+#: calendar/gui/print.c:2414
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2425
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
+#: calendar/gui/print.c:2562 calendar/gui/print.c:2648
+#: calendar/gui/print.c:2740 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/print.c:2593
+#: calendar/gui/print.c:2596
 msgid "Print Item"
 msgstr "Imprimir elemento"
 
-#: calendar/gui/print.c:2759
+#: calendar/gui/print.c:2762
 msgid "Print Setup"
 msgstr "Configurar impresión"
 
-#: calendar/gui/tasks-component.c:314
-#, c-format
-msgid "Task List '%s' will be removed. Are you sure you want to continue?"
-msgstr "La lista de tareas «%s» será eliminada. ¿Seguro que quiere continuar?"
-
-#: calendar/gui/tasks-component.c:372
+#: calendar/gui/tasks-component.c:328
 msgid "New Task List"
 msgstr "Lista de tareas nueva"
 
-#: calendar/gui/tasks-component.c:415
+#: calendar/gui/tasks-component.c:404
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: calendar/gui/tasks-component.c:417 mail/mail-component.c:502
+#: calendar/gui/tasks-component.c:406 mail/mail-component.c:523
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ",%d seleccionado"
 msgstr[1] ",%d seleccionados"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:453
 msgid "Failed upgrading tasks."
 msgstr "Fallo al actualizar las tareas."
 
-#: calendar/gui/tasks-component.c:758
+#: calendar/gui/tasks-component.c:747
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
+msgstr "No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
 
-#: calendar/gui/tasks-component.c:773
+#: calendar/gui/tasks-component.c:762
 msgid "There is no calendar available for creating tasks"
 msgstr "No hay un calendario disponible para crear tareas"
 
-#: calendar/gui/tasks-component.c:1047
+#: calendar/gui/tasks-component.c:856
+msgid "Task Source Selector"
+msgstr "Selector de origen de tareas"
+
+#: calendar/gui/tasks-component.c:1039
 msgid "New task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1040
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1041
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: calendar/gui/tasks-component.c:1055
+#: calendar/gui/tasks-component.c:1047
 msgid "New assigned task"
 msgstr "Nueva tarea asignada"
 
-#: calendar/gui/tasks-component.c:1056
+#: calendar/gui/tasks-component.c:1048
 msgid "Assigne_d Task"
 msgstr "Tarea _asignada"
 
-#: calendar/gui/tasks-component.c:1057
+#: calendar/gui/tasks-component.c:1049
 msgid "Create a new assigned task"
 msgstr "Crea una tarea nueva asignada"
 
-#: calendar/gui/tasks-component.c:1063
+#: calendar/gui/tasks-component.c:1055
 msgid "New task list"
 msgstr "Lista de tareas nueva"
 
-#: calendar/gui/tasks-component.c:1064
+#: calendar/gui/tasks-component.c:1056
 msgid "Task l_ist"
 msgstr "_Lista de tareas"
 
-#: calendar/gui/tasks-component.c:1065
+#: calendar/gui/tasks-component.c:1057
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
-#: calendar/gui/tasks-control.c:370
+#: calendar/gui/tasks-control.c:372
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7239,15 +7529,16 @@ msgstr ""
 "\n"
 "¿Borrar realmente esas tareas?"
 
-#: calendar/gui/tasks-control.c:373
+#: calendar/gui/tasks-control.c:375
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
-#: calendar/gui/tasks-control.c:431
+#: calendar/gui/tasks-control.c:433
 msgid "Print Tasks"
 msgstr "Imprimir tareas"
 
-#: calendar/gui/weekday-picker.c:326
+#. The first letter of each day of the week starting with Sunday
+#: calendar/gui/weekday-picker.c:319
 msgid "SMTWTFS"
 msgstr "DLMXJVS"
 
@@ -7275,15 +7566,15 @@ msgstr "Archivos vCalendar (.vcf)"
 msgid "Appointments and Meetings"
 msgstr "Reuniones y citas"
 
-#: calendar/importers/icalendar-importer.c:494
+#: calendar/importers/icalendar-importer.c:486
 msgid "Reminder!!"
 msgstr "¡¡Recuerde!!"
 
-#: calendar/importers/icalendar-importer.c:702
+#: calendar/importers/icalendar-importer.c:694
 msgid "Calendar Events"
 msgstr "Acontecimientos de calendario"
 
-#: calendar/importers/icalendar-importer.c:727
+#: calendar/importers/icalendar-importer.c:719
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7291,10 +7582,6 @@ msgstr ""
 "Evolution ha encontrado archivos de GNOME Calendar.\n"
 "¿Quiere importarlos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:734
-msgid "Gnome Calendar"
-msgstr "Gnome Calendar"
-
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -7824,7 +8111,7 @@ msgstr "América/Montserrat"
 msgid "America/Nassau"
 msgstr "América/Nassau"
 
-#: calendar/zones.h:138
+#: calendar/zones.h:138 widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "América/Nueva York"
 
@@ -8824,3262 +9111,140 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: camel/camel-cipher-context.c:102
-msgid "Signing is not supported by this cipher"
-msgstr "Este método de cifrado no soporta firmas"
-
-#: camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "Firmando mensaje"
-
-#: camel/camel-cipher-context.c:145
-msgid "Verifying is not supported by this cipher"
-msgstr "Este método de cifrado no soporta verificación"
-
-#: camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "Verificando mensaje"
-
-#: camel/camel-cipher-context.c:189
-msgid "Encryption is not supported by this cipher"
-msgstr "Este método de cifrado no soporta cifrado"
-
-#: camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "Encriptando mensaje"
-
-#: camel/camel-cipher-context.c:232
-msgid "Decryption is not supported by this cipher"
-msgstr "El descifrado no está soportado por este método de cifrado"
-
-#: camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "Desencriptando mensaje"
-
-#: camel/camel-cipher-context.c:271
-msgid "You may not import keys with this cipher"
-msgstr "No puede importar claves con este método de cifrado"
-
-#: camel/camel-cipher-context.c:301
-msgid "You may not export keys with this cipher"
-msgstr "No puede exportar claves con este método de cifrado"
-
-#: camel/camel-data-cache.c:133
-msgid "Unable to create cache path"
-msgstr "No se pudo crear la ruta a la caché"
-
-#: camel/camel-data-cache.c:375
-#, c-format
-msgid "Could not remove cache entry: %s: %s"
-msgstr "No se pudo quitar la entrada de caché: %s: %s"
-
-#: camel/camel-disco-diary.c:194
-#, c-format
-msgid ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-msgstr ""
-"No se pudo escribir una entrada del archivo de actividad: %s\n"
-"Las siguientes operaciones en este servidor no serán registradas\n"
-"cuando se reconecte a la red."
-
-#: camel/camel-disco-diary.c:257
-#, c-format
-msgid ""
-"Could not open `%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"No se pudo abrir «%s»:\n"
-"%s\n"
-"Los cambios hechos a esta carpeta no serán resincronizados."
-
-#: camel/camel-disco-diary.c:293
-msgid "Resynchronizing with server"
-msgstr "Resincronizando con el servidor"
-
-#: camel/camel-disco-folder.c:41
-msgid "Copy folder content locally for offline operation"
-msgstr ""
-"Copiar el contenido de la carpeta localmente para operación desconectada"
-
-#: camel/camel-disco-folder.c:103
-msgid "Downloading new messages for offline mode"
-msgstr "Descargando mensajes nuevos para modo desconectado"
-
-#: camel/camel-disco-folder.c:466
-#, c-format
-msgid "Preparing folder '%s' for offline"
-msgstr "Preparando carpeta «%s» para desconexión"
-
-#: camel/camel-disco-store.c:404
-msgid "You must be working online to complete this operation"
-msgstr "Para completar esta operación debe estar trabajando conectado a la red"
-
-#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
-#: camel/camel-process.c:48
-#, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Falló al crear pipe a «%s»: %s"
-
-#: camel/camel-filter-driver.c:713 camel/camel-process.c:90
-#, c-format
-msgid "Failed to create child process '%s': %s"
-msgstr "Error al crear proceso hijo «%s»: %s"
-
-#: camel/camel-filter-driver.c:756
-#, c-format
-msgid "Invalid message stream received from %s: %s"
-msgstr "Flujo de mensaje inválido recibido desde %s: %s"
-
-#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
-msgid "Syncing folders"
-msgstr "Sincronizando carpetas"
-
-#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Error analizando filtro: %s: %s"
-
-#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Error ejecutando filtro: %s: %s"
-
-#: camel/camel-filter-driver.c:1119
-msgid "Unable to open spool folder"
-msgstr "No se pudo abrir la carpeta temporal"
-
-#: camel/camel-filter-driver.c:1128
-msgid "Unable to process spool folder"
-msgstr "No se pudo procesar la carpeta temporal"
-
-#: camel/camel-filter-driver.c:1143
-#, c-format
-msgid "Getting message %d (%d%%)"
-msgstr "Obteniendo mensaje %d (%d%%)"
-
-#: camel/camel-filter-driver.c:1147
-msgid "Cannot open message"
-msgstr "No se pudo abrir el mensaje"
-
-#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
-#, c-format
-msgid "Failed on message %d"
-msgstr "Error en el mensaje %d"
-
-#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
-msgid "Syncing folder"
-msgstr "Sincronizando carpeta"
-
-#: camel/camel-filter-driver.c:1235
-#, c-format
-msgid "Getting message %d of %d"
-msgstr "Obteniendo mensaje %d de %d"
-
-#: camel/camel-filter-driver.c:1250
-#, c-format
-msgid "Failed at message %d of %d"
-msgstr "Falló en el mensaje %d de %d"
-
-#: camel/camel-filter-search.c:136
-msgid "Failed to retrieve message"
-msgstr "Falló al obtener el mensaje"
-
-#: camel/camel-filter-search.c:386
-msgid "Invalid arguments to (system-flag)"
-msgstr "Argumentos inválidos a (system-flag)"
-
-#: camel/camel-filter-search.c:401
-msgid "Invalid arguments to (user-tag)"
-msgstr "Argumentos inválidos a (user-tag)"
-
-#: camel/camel-filter-search.c:549
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Error al crear proceso hijo «%s»: %s"
-
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: camel/camel-filter-search.c:671 camel/camel-filter-search.c:679
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
-
-#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"No se pudo analizar la expresión de búsqueda: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Error ejecutando la búsqueda según la expresión: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
-msgid "(match-all) requires a single bool result"
-msgstr "(coincidir con todas) requiere un único resultado booleano"
-
-#: camel/camel-folder-search.c:755
-msgid "(match-threads) not allowed inside match-all"
-msgstr "(coincidir-conversaciones) no se permite dentro de «coincidir-todo»"
-
-#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
-msgid "(match-threads) requires a match type string"
-msgstr "(coincidir-conversaciones) requiere una cadena de coincidencia"
-
-#: camel/camel-folder-search.c:784
-msgid "(match-threads) expects an array result"
-msgstr "(coincidir-conversaciones) espera un resultado array"
-
-#: camel/camel-folder-search.c:790
-msgid "(match-threads) requires the folder set"
-msgstr "(coincidir-conversaciones) requiere que se establezca una carpeta"
-
-#: camel/camel-folder-search.c:879
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Realizando búsqueda en cabecera desconocida: %s"
-
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Operación no implementada: añadir mensaje: para %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Operación no implementada: búsqueda según la expresión: para %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Operación no implementada: búsqueda por uids: para %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Moviendo mensajes"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Copiando mensajes"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "Aprendiendo spam"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "Aprendiendo no-spam"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtrando mensajes(s) nuevo(s)"
-
-#: camel/camel-gpg-context.c:735
-#, c-format
-msgid ""
-"Unexpected GnuPG status message encountered:\n"
-"\n"
-"%s"
-msgstr ""
-"Se encontró un mensaje de estado GNUPG inesperado:\n"
-"\n"
-"%s"
-
-#: camel/camel-gpg-context.c:749
-msgid "Failed to parse gpg userid hint."
-msgstr "Falló al analizar el id del usuario gpg."
-
-#: camel/camel-gpg-context.c:773
-msgid "Failed to parse gpg passphrase request."
-msgstr "Falló al analizar la solicitud de contraseña gpg."
-
-#: camel/camel-gpg-context.c:787
-#, c-format
-msgid ""
-"You need a passphrase to unlock the key for\n"
-"user: \"%s\""
-msgstr ""
-"Necesita una contraseña para desbloquear la clave para \n"
-"el usuario: «%s»"
-
-#: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
-#: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1231
-#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
-#: mail/mail-send-recv.c:611
-msgid "Cancelled."
-msgstr "Cancelado."
-
-#: camel/camel-gpg-context.c:822
-msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Falló al desbloquear la clave secreta: se dieron 3 contraseñas falsas."
-
-#: camel/camel-gpg-context.c:828
-#, c-format
-msgid "Unexpected response from GnuPG: %s"
-msgstr "Respuesta inesperada del GNUPG: %s"
-
-#: camel/camel-gpg-context.c:880
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr "No se pudo cifrar este mensaje: no hay destinatarios."
-
-#: camel/camel-gpg-context.c:1157
-#, c-format
-msgid ""
-"Failed to GPG %s: %s\n"
-"\n"
-"%s"
-msgstr ""
-"Fallo en GPG %s mensaje: %s\n"
-"\n"
-"%s"
-
-#: camel/camel-gpg-context.c:1162
-#, c-format
-msgid "Failed to GPG %s: %s\n"
-msgstr "Error con GPG %s: %s\n"
-
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:419
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "No se pudo generar los datos de la firma: %s"
-
-#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1762
-#: camel/camel-gpg-context.c:1813
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Error al ejecutar gpg: %s"
-
-#: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491
-#: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605
-#: camel/camel-gpg-context.c:1690 camel/camel-gpg-context.c:1714
-#: camel/camel-gpg-context.c:1784 camel/camel-gpg-context.c:1835
-msgid "Failed to execute gpg."
-msgstr "Falló al ejecutar gpg."
-
-#: camel/camel-gpg-context.c:1350
-msgid "This is a digitally signed message part"
-msgstr "Esta parte del mensaje está firmada digitalmente"
-
-#: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:721
-#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
-msgid "Cannot verify message signature: Incorrect message format"
-msgstr ""
-"No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
-
-#: camel/camel-gpg-context.c:1477
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"No se pudo verificar la firma del mensaje: no pude crear un archivo "
-"temporal: %s"
-
-#: camel/camel-gpg-context.c:1565
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "No se pudo generar los datos de cifrado: %s"
-
-#: camel/camel-gpg-context.c:1623
-msgid "This is a digitally encrypted message part"
-msgstr "Esta parte del mensaje está cifrada digitalmente"
-
-#: camel/camel-gpg-context.c:1721 camel/camel-smime-context.c:995
-msgid "Encrypted content"
-msgstr "Contenido cifrado"
-
-#: camel/camel-gpg-context.c:1740
-msgid "Unable to parse message content"
-msgstr "No se pudo interpretar el contenido del mensaje"
-
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "No se pudo crear un conducto(pipe) para la ayuda: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "No se pudo hacer un bifurcar del ayudante de bloqueo: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "No se pudo bloquear «%s»: error del protocolo con lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "No se pudo bloquear «%s»"
-
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "No se pudo bloquear el archivo para %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Fallo al hacer un bloqueo usando fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Fallo al hacer un bloqueo usando flock(2): %s"
-
-#: camel/camel-movemail.c:107
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "No se pudo comprobar el archivo de correo %s: %s"
-
-#: camel/camel-movemail.c:120
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "No se pudo abrir el archivo de correo %s: %s"
-
-#: camel/camel-movemail.c:128
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "No se pudo abrir el archivo de correo temporal %s: %s"
-
-#: camel/camel-movemail.c:157
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Falló al guardar el correo en al archivo temporal %s: %s"
-
-#: camel/camel-movemail.c:187
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "No se pudo crear un pipe: %s"
-
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not fork: %s"
-msgstr "No se pudo bifurcar: %s"
-
-#: camel/camel-movemail.c:237
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "El programa Movemail ha fallado: %s"
-
-#: camel/camel-movemail.c:238
-msgid "(Unknown error)"
-msgstr "(Error desconocido)"
-
-#: camel/camel-movemail.c:261
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Error leyendo el archivo de correo: %s"
-
-#: camel/camel-movemail.c:272
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Error escribiendo en el archivo temporal de correo: %s"
-
-#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
-#, c-format
-msgid "Error copying mail temp file: %s"
-msgstr "Error copiando el correo al archivo temporal: %s"
-
-#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Falló al descifrar la parte MIME: error del protocolo"
-
-#: camel/camel-multipart-encrypted.c:257
-msgid "Failed to decrypt MIME part: invalid structure"
-msgstr "Falló al descifrar la parte MIME: estructura inválida"
-
-#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
-msgid "parse error"
-msgstr "error de análisis"
-
-#: camel/camel-provider.c:59
-msgid "Virtual folder email provider"
-msgstr "Proveedor de correo de la carpeta virtual"
-
-#: camel/camel-provider.c:61
-msgid "For reading mail as a query of another set of folders"
-msgstr "Para leer correo como una búsqueda de otras carpetas"
-
-#: camel/camel-provider.c:172
-#, c-format
-msgid "Could not load %s: Module loading not supported on this system."
-msgstr ""
-"No se pudo cargar %s: La carga de módulos no está implementada es este "
-"sistema."
-
-#: camel/camel-provider.c:181
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "No se pudo cargar %s: %s"
-
-#: camel/camel-provider.c:189
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "No se pudo cagar %s: No hay código de inicialización en el módulo."
-
-#: camel/camel-provider.c:356 camel/camel-session.c:160
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "No hay proveedor para el protocolo «%s»"
-
-#: camel/camel-sasl-anonymous.c:35
-msgid "Anonymous"
-msgstr "Anónimo"
-
-#: camel/camel-sasl-anonymous.c:37
-msgid "This option will connect to the server using an anonymous login."
-msgstr "Esta opción conectará con el servidor usando un usuario anónimo."
-
-#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
-msgid "Authentication failed."
-msgstr "Falló en la autenticación."
-
-#: camel/camel-sasl-anonymous.c:121
-#, c-format
-msgid ""
-"Invalid email address trace information:\n"
-"%s"
-msgstr ""
-"Dirección de correo errónea información de ayuda:\n"
-"%s"
-
-#: camel/camel-sasl-anonymous.c:133
-#, c-format
-msgid ""
-"Invalid opaque trace information:\n"
-"%s"
-msgstr ""
-"Información opaca de seguimiento inválida:\n"
-"%s"
-
-#: camel/camel-sasl-anonymous.c:145
-#, c-format
-msgid ""
-"Invalid trace information:\n"
-"%s"
-msgstr ""
-"Información de seguimiento inválida:\n"
-"%s"
-
-#: camel/camel-sasl-cram-md5.c:35
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/camel-sasl-cram-md5.c:37
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr ""
-"Esta opción conectará con el servidor usando una clave segura CRAM-MD5, si "
-"el servidor lo implementa."
-
-#: camel/camel-sasl-digest-md5.c:48
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: camel/camel-sasl-digest-md5.c:50
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-msgstr ""
-"Esta opción conectará con el servidor usando una clave segura DIGEST-MD5, si "
-"el servidor lo implementa."
-
-#: camel/camel-sasl-digest-md5.c:813
-msgid "Server challenge too long (>2048 octets)\n"
-msgstr "Reto del servidor demasiado largo (>2048 octetos)\n"
-
-#: camel/camel-sasl-digest-md5.c:822
-msgid "Server challenge invalid\n"
-msgstr "Reto del servidor no válido\n"
-
-#: camel/camel-sasl-digest-md5.c:828
-msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr ""
-"El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
-
-#: camel/camel-sasl-digest-md5.c:850
-msgid "Server response did not contain authorization data\n"
-msgstr "La respuesta del servidor no contenía información de autorización\n"
-
-#: camel/camel-sasl-digest-md5.c:868
-msgid "Server response contained incomplete authorization data\n"
-msgstr ""
-"La respuesta del servidor contenía información de autorización incompleta\n"
-
-#: camel/camel-sasl-digest-md5.c:878
-msgid "Server response does not match\n"
-msgstr "La respuesta del servidor no coincide\n"
-
-#: camel/camel-sasl-gssapi.c:52
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: camel/camel-sasl-gssapi.c:54
-msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "Esta opción conectará con el servidor usando autenticación Kerberos 5."
-
-#: camel/camel-sasl-gssapi.c:152
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
-msgstr ""
-"El mecanismo especificado no está soportado por la credencial provista, o es "
-"irreconocible por la implementación."
-
-#: camel/camel-sasl-gssapi.c:157
-msgid "The provided target_name parameter was ill-formed."
-msgstr "El parámetro target_name no ha sido formado correctamente."
-
-#: camel/camel-sasl-gssapi.c:160
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
-msgstr ""
-"El parámetro target_name proporcionado contenía un tipo de nombre inválido o "
-"no soportado."
-
-#: camel/camel-sasl-gssapi.c:164
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
-msgstr ""
-"input_token contiene diferentes vinculaciones de canal a aquellas "
-"especificadas por medio del parámetro input_chan_bindings."
-
-#: camel/camel-sasl-gssapi.c:169
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
-msgstr ""
-"input_token contiene una firma inválida, o una firma que no pudo ser "
-"verificada."
-
-#: camel/camel-sasl-gssapi.c:173
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
-msgstr ""
-"Las credenciales suministradas no fueron válidas para la iniciación del "
-"contexto, o el manipulador de credenciales no referenciaba ninguna "
-"credencial."
-
-#: camel/camel-sasl-gssapi.c:178
-msgid "The supplied context handle did not refer to a valid context."
-msgstr ""
-"El manipulador de contexto suministrado no se refiere a un contexto válido."
-
-#: camel/camel-sasl-gssapi.c:181
-msgid "The consistency checks performed on the input_token failed."
-msgstr "Los chequeos de consistencia efectuados en input_token han fallado."
-
-#: camel/camel-sasl-gssapi.c:184
-msgid "The consistency checks performed on the credential failed."
-msgstr "Han fallado los chequeos de consistencia realizados en la credencial."
-
-#: camel/camel-sasl-gssapi.c:187
-msgid "The referenced credentials have expired."
-msgstr "Las credenciales referenciadas han expirado."
-
-#: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:242
-#: camel/camel-sasl-gssapi.c:278 camel/camel-sasl-gssapi.c:293
-#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1236
-msgid "Bad authentication response from server."
-msgstr "Respuesta de autenticación errónea desde el servidor."
-
-#: camel/camel-sasl-gssapi.c:217
-#, c-format
-msgid "Failed to resolve host `%s': %s"
-msgstr "Falló al resolver host «%s»: %s"
-
-#: camel/camel-sasl-gssapi.c:303
-msgid "Unsupported security layer."
-msgstr "Capa de seguridad no soportada."
-
-#: camel/camel-sasl-kerberos4.c:41
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/camel-sasl-kerberos4.c:43
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Esta opción conectará con el servidor usando autenticación Kerberos 4."
-
-#: camel/camel-sasl-kerberos4.c:162
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"No se pudo obtener el pase Kerberos:\n"
-"%s"
-
-#: camel/camel-sasl-login.c:32
-msgid "Login"
-msgstr "Inicio de sesión"
-
-#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
-msgid "This option will connect to the server using a simple password."
-msgstr "Esta opción conectará con el servidor usando una simple contraseña."
-
-#: camel/camel-sasl-login.c:127
-msgid "Unknown authentication state."
-msgstr "Estado de la autenticación desconocido."
-
-#: camel/camel-sasl-ntlm.c:31
-msgid "NTLM / SPA"
-msgstr "NTLM / SPA"
-
-#: camel/camel-sasl-ntlm.c:33
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
-msgstr ""
-"Esta opción conectará a un servidor basado en Windows usando NTLM / Secure "
-"Password Autentication."
-
-#: camel/camel-sasl-plain.c:32
-msgid "PLAIN"
-msgstr "PLAIN"
-
-#: camel/camel-sasl-popb4smtp.c:36
-msgid "POP before SMTP"
-msgstr "POP antes de SMTP"
-
-#: camel/camel-sasl-popb4smtp.c:38
-msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Esta opción autorizará conexiones POP antes de intentar SMTP"
-
-#: camel/camel-sasl-popb4smtp.c:103
-msgid "POP Source URI"
-msgstr "URI de la fuente POP"
-
-#: camel/camel-sasl-popb4smtp.c:106
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "Autenticación POP antes de SMTP usando un transporte desconocido"
-
-#: camel/camel-sasl-popb4smtp.c:111
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "Autenticación POP antes de SMTP usando una fuente no POP"
-
-#: camel/camel-search-private.c:114
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Falló la compilación de la expresión regular: %s: %s"
-
-#: camel/camel-service.c:271
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "La URL «%s» necesita un componente de nombre de usuario"
-
-#: camel/camel-service.c:275
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "La URL «%s» necesita un componente host"
-
-#: camel/camel-service.c:279
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "La URL «%s» necesita un componente de ruta"
-
-#: camel/camel-service.c:729
-#, c-format
-msgid "Resolving: %s"
-msgstr "Resolviendo: %s"
-
-#: camel/camel-service.c:760 camel/camel-service.c:884
-#, c-format
-msgid "Failure in name lookup: %s"
-msgstr "Error al resolver: %s"
-
-#: camel/camel-service.c:781 camel/camel-service.c:905
-#, c-format
-msgid "Host lookup failed: cannot create thread: %s"
-msgstr "La resolución del host ha fallado: no se puede crear el hilo: %s"
-
-#: camel/camel-service.c:794
-#, c-format
-msgid "Host lookup failed: %s: host not found"
-msgstr "Error al resolver el host: %s: host no encontrado"
-
-#: camel/camel-service.c:797
-#, c-format
-msgid "Host lookup failed: %s: unknown reason"
-msgstr "Error al resolver el host: %s: razón desconocida"
-
-#: camel/camel-service.c:851
-msgid "Resolving address"
-msgstr "Resolviendo dirección"
-
-#: camel/camel-service.c:920
-msgid "Host lookup failed: host not found"
-msgstr "Error al resolver el host: host no encontrado"
-
-#: camel/camel-service.c:923
-msgid "Host lookup failed: unknown reason"
-msgstr "Error al resolver el host: razón desconocida"
-
-#: camel/camel-session.c:282
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"No se pudo crear el directorio %s:\n"
-"%s"
-
-#: camel/camel-smime-context.c:104
-#, c-format
-msgid "Enter security pass-phrase for `%s'"
-msgstr "Introduzca su frase de paso para %s"
-
-#: camel/camel-smime-context.c:261
-#, c-format
-msgid "Cannot find certificate for '%s'"
-msgstr "No se puede encontrar el certificado para «%s»"
-
-#: camel/camel-smime-context.c:267
-msgid "Cannot create CMS message"
-msgstr "No se pudo crear el mensaje CMS"
-
-#: camel/camel-smime-context.c:272
-msgid "Cannot create CMS signedData"
-msgstr "No se puede crear el CMS signedData"
-
-#: camel/camel-smime-context.c:278
-msgid "Cannot attach CMS signedData"
-msgstr "No se pudo adjuntar el CMS signedData"
-
-#: camel/camel-smime-context.c:285
-msgid "Cannot attach CMS data"
-msgstr "No se pudo adjuntar los datos CMS"
-
-#: camel/camel-smime-context.c:291
-msgid "Cannot create CMS SignerInfo"
-msgstr "No se puede crear la información CMS SignerInfo"
-
-#: camel/camel-smime-context.c:297
-msgid "Cannot find cert chain"
-msgstr "No se puede encontrar la cadena del certificado"
-
-#: camel/camel-smime-context.c:303
-msgid "Cannot add CMS SigningTime"
-msgstr "No se puede añadir la hora de firma CMS"
-
-#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
-#, c-format
-msgid "Encryption cert for '%s' does not exist"
-msgstr "No existe el certificado de cifrado para «%s»"
-
-#: camel/camel-smime-context.c:344
-msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr "No se puede añadir el atributo SMIMEEncKeyPrefs"
-
-#: camel/camel-smime-context.c:349
-msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr "No se puede añadir el atributo SMIMEEncKeyPrefs"
-
-#: camel/camel-smime-context.c:354
-msgid "Cannot add encryption certificate"
-msgstr "No se puede añadir el certificado de cifrado"
-
-#: camel/camel-smime-context.c:360
-msgid "Cannot add CMS SignerInfo"
-msgstr "No se puede añadir la información del firmante CMS"
-
-#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
-msgid "Cannot create encoder context"
-msgstr "No se pudo crear un contexto de codificación"
-
-#: camel/camel-smime-context.c:436
-msgid "Failed to add data to CMS encoder"
-msgstr "Falló al añadir datos al codificador CMS"
-
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
-msgid "Failed to encode data"
-msgstr "Falló al codificar datos"
-
-#: camel/camel-smime-context.c:514
-msgid "Unverified"
-msgstr "Sin verificar"
-
-#: camel/camel-smime-context.c:516
-msgid "Good signature"
-msgstr "Firma buena"
-
-#: camel/camel-smime-context.c:518
-msgid "Bad signature"
-msgstr "Firma mala"
-
-#: camel/camel-smime-context.c:520
-msgid "Content tampered with or altered in transit"
-msgstr "El contenido ha sido falsificado o alterado en tránsito"
-
-#: camel/camel-smime-context.c:522
-msgid "Signing certificate not found"
-msgstr "Certificado firmante no encontrado"
-
-#: camel/camel-smime-context.c:524
-msgid "Signing certificate not trusted"
-msgstr "Certificado firmante sin confianza"
-
-#: camel/camel-smime-context.c:526
-msgid "Signature algorithm unknown"
-msgstr "Algoritmo de firma desconocido"
-
-#: camel/camel-smime-context.c:528
-msgid "Signature algorithm unsupported"
-msgstr "Algoritmo de firma no soportado"
-
-#: camel/camel-smime-context.c:530
-msgid "Malformed signature"
-msgstr "Firma mal formada"
-
-#: camel/camel-smime-context.c:532
-msgid "Processing error"
-msgstr "Error de procesamiento"
-
-#: camel/camel-smime-context.c:569
-msgid "No signedData in signature"
-msgstr "No hay datos firmados en la firma"
-
-#: camel/camel-smime-context.c:576
-msgid "Digests missing from enveloped data"
-msgstr "Faltan los digests de los datos envueltos"
-
-#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
-msgid "Cannot calculate digests"
-msgstr "No se pudieron calcular los digests"
-
-#: camel/camel-smime-context.c:604
-msgid "Cannot set message digests"
-msgstr "No se pueden obtener los digests del mensaje"
-
-#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
-msgid "Certificate import failed"
-msgstr "Falló en la importación del certificado"
-
-#: camel/camel-smime-context.c:628
-msgid "Certificate only message, cannot verify certificates"
-msgstr "Mensaje sólo de certificado, no se pueden verificar los certificados"
-
-#: camel/camel-smime-context.c:631
-msgid "Certificate only message, certificates imported and verified"
-msgstr "Mensaje sólo de certificado, certificados importados y verificados"
-
-#: camel/camel-smime-context.c:635
-msgid "Cannot find signature digests"
-msgstr "No se pueden encontrar los digests de la firma"
-
-#: camel/camel-smime-context.c:651
-#, c-format
-msgid "Signer: %s <%s>: %s\n"
-msgstr "Firmante: %s <%s>: %s\n"
-
-#: camel/camel-smime-context.c:752
-msgid "Decoder failed"
-msgstr "La decodificación ha fallado"
-
-#: camel/camel-smime-context.c:804
-#, c-format
-msgid "Cannot find certificate for `%s'"
-msgstr "No se puede encontrar el certificado para «%s»"
-
-#: camel/camel-smime-context.c:811
-msgid "Cannot find common bulk encryption algorithm"
-msgstr "No se puede encontrar un algoritmo de encriptación común"
-
-#. PORT_GetError(); ??
-#: camel/camel-smime-context.c:820
-msgid "Cannot allocate slot for encryption bulk key"
-msgstr "No se puede reservar un slot para la clave de encriptación"
-
-#: camel/camel-smime-context.c:831
-msgid "Cannot create CMS Message"
-msgstr "No se pudo crear el mensaje CMS"
-
-#: camel/camel-smime-context.c:837
-msgid "Cannot create CMS EnvelopedData"
-msgstr "No se puede crear CMS EnvelopedData"
-
-#: camel/camel-smime-context.c:843
-msgid "Cannot attach CMS EnvelopedData"
-msgstr "No se puede adjuntar CMS EvelopedData"
-
-#: camel/camel-smime-context.c:849
-msgid "Cannot attach CMS data object"
-msgstr "No se puede adjuntar el objeto de datos CMS"
-
-#: camel/camel-smime-context.c:858
-msgid "Cannot create CMS RecipientInfo"
-msgstr "No se puede crear CMS RecipientInfo"
-
-#: camel/camel-smime-context.c:863
-msgid "Cannot add CMS RecipientInfo"
-msgstr "No se puede añadir CMS RecipientInfo"
-
-#: camel/camel-smime-context.c:888
-msgid "Failed to add data to encoder"
-msgstr "Falló al añadir datos al codificador"
-
-#: camel/camel-smime-context.c:975
-#, c-format
-msgid "Decoder failed, error %d"
-msgstr "El decodificador ha fallado, error %d"
-
-#: camel/camel-smime-context.c:982
-msgid "S/MIME Decrypt: No encrypted content found"
-msgstr "Desencriptación S/MIME: No se ha encontrado contenido encriptado"
-
-#: camel/camel-smime-context.c:1009
-msgid "import keys: unimplemented"
-msgstr "importación de claves: no implementado"
-
-#: camel/camel-smime-context.c:1017
-msgid "export keys: unimplemented"
-msgstr "exportación de claves: no implementado"
-
-#: camel/camel-store.c:213
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "No se pudo obtener la carpeta: Operación no válida en este almacén"
-
-#: camel/camel-store.c:243
-#, c-format
-msgid "Cannot create folder `%s': folder exists"
-msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
-
-#: camel/camel-store.c:297
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "No se pudo crear la carpeta: Operación no válida en este almacén"
-
-#: camel/camel-store.c:325
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
-
-#: camel/camel-store.c:389 camel/camel-vee-store.c:351
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "No se pudo borrar la carpeta: %s: Operación no válida"
-
-#: camel/camel-store.c:439 camel/camel-vee-store.c:388
-#: camel/providers/local/camel-maildir-store.c:232
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "No se pudo renombrar la carpeta: %s: Operación no válida"
-
-#: camel/camel-store.c:777
-msgid "Trash"
-msgstr "Papelera"
-
-#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
-msgid "Junk"
-msgstr "Spam"
-
-#: camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to get issuer's certificate"
-msgstr "No se pudo obtener el certificado del emisor"
-
-#: camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to get Certificate Revocation List"
-msgstr "No se pudo obtener la Lista de Revocación de Certificados"
-
-#: camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decrypt certificate signature"
-msgstr "No se pudo descifrar la firma del certificado"
-
-#: camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr ""
-"No se pudo descifrar la firma de la Lista de Revocación de Certificados"
-
-#: camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decode issuer's public key"
-msgstr "No se pudo decodificar la clave pública del emisor"
-
-#: camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate signature failure"
-msgstr "Falló en la firma del certificado"
-
-#: camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate Revocation List signature failure"
-msgstr "Fallo en la firma de la lista de revocación de certificados"
-
-#: camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate not yet valid"
-msgstr "Certificado aún no válido"
-
-#: camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate has expired"
-msgstr "El certificado ha caducado"
-
-#: camel/camel-tcp-stream-openssl.c:586
-msgid "CRL not yet valid"
-msgstr "CRL todavía no válida"
-
-#: camel/camel-tcp-stream-openssl.c:588
-msgid "CRL has expired"
-msgstr "La CRL ha caducado"
-
-#: camel/camel-tcp-stream-openssl.c:593
-msgid "Error in CRL"
-msgstr "Error en CRL"
-
-#: camel/camel-tcp-stream-openssl.c:595
-msgid "Out of memory"
-msgstr "Memoria agotada"
-
-#: camel/camel-tcp-stream-openssl.c:597
-msgid "Zero-depth self-signed certificate"
-msgstr "Certificado de profundidad cero auto-firmado"
-
-#: camel/camel-tcp-stream-openssl.c:599
-msgid "Self-signed certificate in chain"
-msgstr "Certificado auto-firmado en cadena"
-
-#: camel/camel-tcp-stream-openssl.c:601
-msgid "Unable to get issuer's certificate locally"
-msgstr "No se pudo obtener el certificado del emisor localmente"
-
-#: camel/camel-tcp-stream-openssl.c:603
-msgid "Unable to verify leaf signature"
-msgstr "No se pudo verificar firma de la la hoja"
-
-#: camel/camel-tcp-stream-openssl.c:605
-msgid "Certificate chain too long"
-msgstr "Cadena de certificados demasiado larga"
-
-#: camel/camel-tcp-stream-openssl.c:607
-msgid "Certificate Revoked"
-msgstr "Certificado revocado"
-
-#: camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Autoridad certificadora inválida (CA)"
-
-#: camel/camel-tcp-stream-openssl.c:611
-msgid "Path length exceeded"
-msgstr "Longitud de ruta excedida"
-
-#: camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid purpose"
-msgstr "Propósito inválido"
-
-#: camel/camel-tcp-stream-openssl.c:615
-msgid "Certificate untrusted"
-msgstr "Certificado sin confianza"
-
-#: camel/camel-tcp-stream-openssl.c:617
-msgid "Certificate rejected"
-msgstr "Certificado rechazado"
-
-#: camel/camel-tcp-stream-openssl.c:620
-msgid "Subject/Issuer mismatch"
-msgstr "Incoherencia Asunto/Emisor"
-
-#: camel/camel-tcp-stream-openssl.c:622
-msgid "AKID/SKID mismatch"
-msgstr "No coincide AKID/SKID "
-
-#: camel/camel-tcp-stream-openssl.c:624
-msgid "AKID/Issuer serial mismatch"
-msgstr "Las series AKID/Issuer no coinciden"
-
-#: camel/camel-tcp-stream-openssl.c:626
-msgid "Key usage does not support certificate signing"
-msgstr "El uso de la clave no soporta firmado de certificados"
-
-#: camel/camel-tcp-stream-openssl.c:629
-msgid "Error in application verification"
-msgstr "Error en la verificación de la aplicación"
-
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
-#, c-format
-msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
-msgstr ""
-"Emisor:        %s\n"
-"Tema:         %s\n"
-"Huella:        %s\n"
-"Firma:         %s"
-
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
-msgid "GOOD"
-msgstr "GOOD"
-
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
-msgid "BAD"
-msgstr "BAD"
-
-#: camel/camel-tcp-stream-openssl.c:704
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Certificado erróneo de %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"¿Quiere aceptarlo de todos modos?"
-
-#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:836
-#, c-format
-msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
-msgstr ""
-"Solicitud de Certificado SSL %s:\n"
-"\n"
-"%s\n"
-"\n"
-"¿Quiere aceptar?"
-
-#: camel/camel-tcp-stream-ssl.c:880
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"Problema del certificado: %s\n"
-"Emisor: %s"
-
-#: camel/camel-tcp-stream-ssl.c:932
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-"Dominio del certificado erróneo: %s\n"
-"Emisor: %s"
-
-#: camel/camel-tcp-stream-ssl.c:950
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Certificado caducado: %s\n"
-"Emisor: %s"
-
-#: camel/camel-tcp-stream-ssl.c:967
-#, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Lista de revocación de certificados caducada: %s\n"
-"Emisor: %s"
-
-#: camel/camel-url.c:292
-#, c-format
-msgid "Could not parse URL `%s'"
-msgstr "No se pudo analizar la URL «%s»"
-
-#: camel/camel-vee-folder.c:633
-#, c-format
-msgid "Error storing `%s': %s"
-msgstr "Error guardando «%s»: %s"
-
-#: camel/camel-vee-folder.c:675
-#, c-format
-msgid "No such message %s in %s"
-msgstr "No existe el mensaje %s en %s"
-
-#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "No se pudo copiar o mover mensajes a una Carpeta Virtual"
-
-#: camel/camel-vee-store.c:374
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "No se pudo borrar la carpeta: %s: No existe tal carpeta"
-
-#: camel/camel-vee-store.c:396
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "No se pudo cambiarle el nombre a la carpeta: %s: No existe"
-
-#: camel/camel-vtrash-folder.c:44
-msgid "Cannot copy messages to the Trash folder"
-msgstr "No puede copiar mensajes a la carpeta Basura"
-
-#: camel/camel-vtrash-folder.c:46
-msgid "Cannot copy messages to the Junk folder"
-msgstr "No puede copiar mensajes a la carpeta «Spam»"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:53
-#: camel/providers/imap4/camel-imap4-provider.c:35
-msgid "Checking for new mail"
-msgstr "Comprobación de correo nuevo"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap/camel-imap-provider.c:45
-#: camel/providers/imap4/camel-imap4-provider.c:37
-msgid "Check for new messages in all folders"
-msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:59
-msgid "Apply filters to new messages in Inbox on this server"
-msgstr ""
-"Aplicar filtros a los mensajes nuevos en la bandeja de entrada de este "
-"servidor"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:61
-#: camel/providers/imap/camel-imap-provider.c:66
-msgid "Check new messages for Junk contents"
-msgstr "Comprobar si el contenido de los mensajes nuevos es spam"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:63
-#: camel/providers/imap/camel-imap-provider.c:68
-msgid "Only check for Junk messages in the INBOX folder"
-msgstr "Sólo comprobar si hay spam en la carpeta INBOX"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:65
-#: camel/providers/imap/camel-imap-provider.c:70
-msgid "Automatically synchronize remote mail locally"
-msgstr "Sincronizar automáticamente el correo remoto localmente"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Address Book and Calendar"
-msgstr "Libreta de direcciones y calendario"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Post Office Agent:"
-msgstr "Agente de oficina de correos:"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:75
-msgid "Post Office Agent SOAP Port:"
-msgstr "Puerto del agente de la oficina de correos SOAP:"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:78
-msgid "Use Secure Connection (SSL)"
-msgstr "Usar conexión segura (SSL)"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:92
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:94
-msgid "For accessing Novell Groupwise servers"
-msgstr "Para acceder a servidores Novell Groupwise"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:109
-#: camel/providers/imap/camel-imap-provider.c:93
-#: camel/providers/imap4/camel-imap4-provider.c:70
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
-msgid "Password"
-msgstr "Contraseña"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:111
-#: camel/providers/imap/camel-imap-provider.c:95
-#: camel/providers/imapp/camel-imapp-provider.c:67
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Esta opción conectará con el servidor IMAP usando una contraseña de texto "
-"plano."
-
-#: camel/providers/groupwise/camel-gw-listener.c:362
-msgid "Checklist"
-msgstr "Lista de comprobación"
-
-#: camel/providers/imap/camel-imap-command.c:218
-#: camel/providers/imap/camel-imap-command.c:257
-#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3220
-msgid "Operation cancelled"
-msgstr "Operación cancelada"
-
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3223
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "El servidor se desconectó inesperadamente: %s"
-
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/imap4/camel-imap4-store.c:283
-#: camel/providers/pop3/camel-pop3-store.c:543
-#: camel/providers/pop3/camel-pop3-store.c:550
-#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1220
-msgid "Unknown error"
-msgstr "Error desconocido"
-
-#. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:320
-#, c-format
-msgid ""
-"Alert from IMAP server %s@%s:\n"
-"%s"
-msgstr ""
-"Respuesta inesperada del servidor IMAP: %s@%s:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-command.c:389
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Respuesta inesperada del servidor IMAP: %s"
-
-#: camel/providers/imap/camel-imap-command.c:399
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "El comando IMAP ha fallado: %s"
-
-#: camel/providers/imap/camel-imap-command.c:457
-msgid "Server response ended too soon."
-msgstr "La respuesta del servidor terminó demasiado pronto."
-
-#: camel/providers/imap/camel-imap-command.c:649
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "La respuesta del servidor IMAP no contenía información de %s"
-
-#: camel/providers/imap/camel-imap-command.c:685
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "El servidor IMAP inesperadamente ha respondido OK: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:226
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "No se pudo crear el directorio %s: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:245
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "No se pudo cargar el resumen de %s"
-
-#: camel/providers/imap/camel-imap-folder.c:330
-msgid "Folder was destroyed and recreated on server."
-msgstr "La carpeta fue destruida y recreada en el servidor."
-
-#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:573
-msgid "Scanning for changed messages"
-msgstr "Buscando mensajes modificados"
-
-#: camel/providers/imap/camel-imap-folder.c:1938
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "No se pudo descargar el mensaje: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:1975
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"No se pudo obtener el mensaje; %s\n"
-"  %s"
-
-#: camel/providers/imap/camel-imap-folder.c:1975
-#: camel/providers/local/camel-maildir-folder.c:244
-#: camel/providers/local/camel-mbox-folder.c:418
-#: camel/providers/local/camel-mh-folder.c:202
-msgid "No such message"
-msgstr "No existe ese mensaje"
-
-#: camel/providers/imap/camel-imap-folder.c:2017
-#: camel/providers/imap/camel-imap-folder.c:2620
-#: camel/providers/nntp/camel-nntp-folder.c:220
-msgid "This message is not currently available"
-msgstr "Este mensaje no está disponible actualmente"
-
-#: camel/providers/imap/camel-imap-folder.c:2283
-#: camel/providers/imap/camel-imap-folder.c:2353
-msgid "Fetching summary information for new messages"
-msgstr "Obteniendo información de los nuevos mensajes"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr ""
-"Respuesta del servidor incompleta: no hay información proporcionada para el "
-"mensaje %d"
-
-#: camel/providers/imap/camel-imap-folder.c:2469
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr ""
-"Respuesta incompleta del servidor: No se proporcionó un UID para el mensaje %"
-"d"
-
-#: camel/providers/imap/camel-imap-folder.c:2482
+#: composer/e-msg-composer-attachment-bar.c:101
 #, c-format
-msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
-msgstr ""
-"Respuesta inesperada del servidor: Se proporcionaron UIDs idénticos para los "
-"mensajes %d y %d"
-
-#: camel/providers/imap/camel-imap-folder.c:2658
-msgid "Could not find message body in FETCH response."
-msgstr "No se pudo encontrar el cuerpo del mensaje en la respuesta de FETCH."
-
-#: camel/providers/imap/camel-imap-message-cache.c:155
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "No se pudo abrir directorio de cache: %s"
-
-#: camel/providers/imap/camel-imap-message-cache.c:252
-#: camel/providers/imap/camel-imap-message-cache.c:309
-#: camel/providers/imap/camel-imap-message-cache.c:340
-#: camel/providers/imap/camel-imap-message-cache.c:372
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "Error al cachear el mensaje %s: %s"
-
-#: camel/providers/imap/camel-imap-message-cache.c:417
-#, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Error al cachear %s: %s"
-
-#: camel/providers/imap/camel-imap-provider.c:43
-msgid "Checking for New Mail"
-msgstr "Comprobación de correo nuevo"
-
-#: camel/providers/imap/camel-imap-provider.c:48
-msgid "Connection to Server"
-msgstr "Conexión con el servidor"
-
-#: camel/providers/imap/camel-imap-provider.c:50
-msgid "Use custom command to connect to server"
-msgstr "Usar un comando personalizado para conectarse al servidor"
-
-#: camel/providers/imap/camel-imap-provider.c:52
-msgid "Command:"
-msgstr "Comando:"
-
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Carpetas"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-#: camel/providers/imap4/camel-imap4-provider.c:42
-msgid "Show only subscribed folders"
-msgstr "Mostrar sólo las carpetas suscritas"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-#: camel/providers/imap4/camel-imap4-provider.c:44
-msgid "Override server-supplied folder namespace"
-msgstr "Ignorar el espacio de nombres suministrado por el servidor"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-#: camel/providers/imap4/camel-imap4-provider.c:46
-msgid "Namespace"
-msgstr "Espacio de nombres"
-
-#: camel/providers/imap/camel-imap-provider.c:64
-msgid "Apply filters to new messages in INBOX on this server"
-msgstr ""
-"Aplicar filtros a los mensajes nuevos en la bandeja de entrada de este "
-"servidor"
-
-#: camel/providers/imap/camel-imap-provider.c:76
-msgid "IMAP"
-msgstr "IMAP"
-
-#: camel/providers/imap/camel-imap-provider.c:78
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Para leer y almacenar correo en los servidores IMAP."
-
-#: camel/providers/imap/camel-imap-store.c:424
-#: camel/providers/imap4/camel-imap4-store.c:177
-#, c-format
-msgid "IMAP server %s"
-msgstr "Servidor IMAP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#: camel/providers/imap4/camel-imap4-store.c:179
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Servicio IMAP para %s en %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap4-store.c:214
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "No se pudo conectar con %s (puerto %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL no disponible"
-
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imap4/camel-imap4-store.c:227
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Conexión cancelada"
-
-#: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap/camel-imap-store.c:706
-#: camel/providers/imap4/camel-imap4-store.c:282
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Falló al conectar al servidor IMAP %s en modo seguro: %s"
-
-#: camel/providers/imap/camel-imap-store.c:676
-#: camel/providers/pop3/camel-pop3-store.c:233
-msgid "SSL/TLS extension not supported."
-msgstr "Extensión SSL/TLS no implementada."
-
-#: camel/providers/imap/camel-imap-store.c:707
-#: camel/providers/pop3/camel-pop3-store.c:274
-msgid "SSL negotiations failed"
-msgstr "Falló la negociación SSL"
-
-#: camel/providers/imap/camel-imap-store.c:844
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "No se pudo conectar con el comando «%s»: %s"
-
-#: camel/providers/imap/camel-imap-store.c:1268
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "El servidor IMAP %s no soporta el método de autenticación requerido %s"
-
-#: camel/providers/imap/camel-imap-store.c:1278
-#: camel/providers/smtp/camel-smtp-transport.c:486
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "No hay soporte para el tipo de autenticación %s"
-
-#: camel/providers/imap/camel-imap-store.c:1301
-#: camel/providers/imapp/camel-imapp-store.c:344
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%s escriba la contraseña IMAP para %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:1315
-msgid "You didn't enter a password."
-msgstr "No introdujo una contraseña."
-
-#: camel/providers/imap/camel-imap-store.c:1344
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"No se pudo autenticar en el servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:1863
-#: camel/providers/imap/camel-imap-store.c:2053
-#, c-format
-msgid "No such folder %s"
-msgstr "No existe la carpeta %s"
-
-#: camel/providers/imap/camel-imap-store.c:1881
-#: camel/providers/imap/camel-imap-store.c:2259
-#: camel/providers/imap4/camel-imap4-store.c:764
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"El nombre de la carpeta «%s» es inválido porque contiene el carácter «%c»"
-
-#: camel/providers/imap/camel-imap-store.c:1939
-#: camel/providers/imap/camel-imap-store.c:2320
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
-
-#: camel/providers/imap/camel-imap-store.c:1994
-#: camel/providers/local/camel-maildir-store.c:139
-#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:236
-#, c-format
-msgid "Cannot create folder `%s': folder exists."
-msgstr "No se pudo crear la carpeta: %s: la carpeta existe."
-
-#: camel/providers/imap/camel-imap-store.c:2270
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Carpeta padre desconocida: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:550
-#: camel/providers/imap4/camel-imap4-command.c:557
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Falló al enviar el comando al servidor IMAP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:656
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Respuesta inesperada del servidor IMAP4 %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:230
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Anuncio de bienvenida inesperado del servidor IMAP: %s."
-
-#: camel/providers/imap4/camel-imap4-engine.c:414
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "No se pudo seleccionar la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-engine.c:420
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "No se pudo seleccionar la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1401
-#: camel/providers/imap4/camel-imap4-engine.c:1431
-#: camel/providers/imap4/camel-imap4-engine.c:1463
-#: camel/providers/imap4/camel-imap4-engine.c:1505
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "El servidor IMAP4 %s se desconectó inesperadamente: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:359
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "No se pudo sincronizar los flags de la carpeta: «%s»: Desconocido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:365
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "No se pudo sincronizar los flags de la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-folder.c:502
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "No se pudo compactar la carpeta: «%s»: Desconocido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:507
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "No se pudo compactar la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-folder.c:697
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"No se pudo obtener el mensaje; %s de la carpeta «%s»: No existe dicho mensaje"
-
-#: camel/providers/imap4/camel-imap4-folder.c:702
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "No se pudo obtener el mensaje; %s de la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-folder.c:827
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "No se pudo agregar el mensaje a la carpeta «%s»: Error desconocido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:856
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "No se pudo agregar el mensaje a la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-folder.c:935
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"No se pudo mover los mensajes de la carpeta «%s» a la carpeta «%s»: "
-"Desconocido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:939
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"No se pudo copiar los mensajes desde la carpeta «%s» a la carpeta «%s»: "
-"Desconocido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:947
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"No se pudo mover los mensajes desde la carpeta «%s» a la carpeta «%s»: "
-"Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-folder.c:951
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"No se pudo copiar los mensajes desde la carpeta «%s» a la carpeta «%s»: "
-"Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr ""
-"Para leer y almacenar correo en los servidores IMAPv4rev. ¡¡EXPERIMENTAL!!"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Esta opción conectará con el servidor IMAPv4rev1 usando una contraseña de "
-"texto plano."
-
-#: camel/providers/imap4/camel-imap4-store.c:257
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Falló al conectar al servidor IMAP %s en modo seguro: El servidor no soporta "
-"STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:363
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"No se pudo autenticar con el servidor IMAP %s usando el mecanismo de "
-"autenticación %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:408
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%s Escriba la contraseña IMAP para %s en el host %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:478
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "No se pudo autenticar frente al servidor IMAP %s usando %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:701
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "No se pudo obtener la carpeta «%s» en el servidor IMAP %s: Desconocido"
-
-#: camel/providers/imap4/camel-imap4-store.c:815
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "No se pudo crear la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:821
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "No se pudo crear la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-store.c:852
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "No se pudo borrar la carpeta «%s»: Carpeta especial"
-
-#: camel/providers/imap4/camel-imap4-store.c:911
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "No se pudo borrar la carpeta: «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:916
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "No se pudo borrar la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-store.c:936
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "No se pudo renombrar la carpeta «%s» a «%s»: Carpeta especial"
-
-#: camel/providers/imap4/camel-imap4-store.c:968
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "No se pudo renombrar la carpeta «%s» a «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:973
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "No se pudo renombrar la carpeta «%s» a «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-store.c:1221
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-"No se pudo obtener la información %s para el patrón «%s» en el servidor IMAP "
-"%s:%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1223
-msgid "Bad command"
-msgstr "Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-store.c:1299
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "No pudo suscribirse a la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1304
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "No pudo suscribirse a la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-store.c:1364
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "No pudo desuscribirse de la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1369
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "No pudo desuscribirse de la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-utils.c:250
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Etiqueta inesperada en la respuesta del servidor IMAP %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:273
-msgid "No data"
-msgstr "Sin datos"
-
-#: camel/providers/imap4/camel-imap4-utils.c:456
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "El servidor IMAP %s se desconectó inesperadamente: %s"
-
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Almacenamiento del mensaje"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"Cliente experimental IMAP 4(.1) \n"
-"Este código no está probado y no está soportado, quizá desee usar imap plano "
-"en su lugar.\n"
-"\n"
-" !!! NO USAR ESTO PARA CORREO EN PRODUCCIÓN  !!!\n"
-
-#: camel/providers/imapp/camel-imapp-store.c:328
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "No se pudo conectar con el servidor POP en %s"
-
-#: camel/providers/local/camel-local-folder.c:179
-msgid "Index message body data"
-msgstr "Indexar datos del cuerpo del mensaje"
-
-#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
-#, c-format
-msgid "~%s (%s)"
-msgstr "~%s (%s)"
-
-#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:392
-#: camel/providers/local/camel-local-folder.c:395
-#, c-format
-msgid "mailbox:%s (%s)"
-msgstr "buzón: %s: (%s)"
-
-#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: camel/providers/local/camel-local-provider.c:43
-msgid "Use the `.folders' folder summary file (exmh)"
-msgstr "Utilice el archivo de sumario de las carpetas «.folder» (exmh)"
-
-#: camel/providers/local/camel-local-provider.c:49
-msgid "MH-format mail directories"
-msgstr "Directorios de correo en formato MH"
-
-#: camel/providers/local/camel-local-provider.c:50
-msgid "For storing local mail in MH-like mail directories."
-msgstr "Para guardar el correo local en directorios del tipo MH."
-
-#: camel/providers/local/camel-local-provider.c:65
-msgid "Local delivery"
-msgstr "Reparto local"
-
-#: camel/providers/local/camel-local-provider.c:66
-msgid ""
-"For retrieving (moving) local mail from standard mbox formated spools into "
-"folders managed by Evolution."
-msgstr ""
-"Para obtener (moviendo) el correo local de colas de correo mbox estándar a "
-"carpetas gestionadas por Evolution."
-
-#: camel/providers/local/camel-local-provider.c:77
-#: camel/providers/local/camel-local-provider.c:94
-msgid "Apply filters to new messages in INBOX"
-msgstr "Aplicar filtros a los mensajes nuevos en la bandeja de entrada"
-
-#: camel/providers/local/camel-local-provider.c:83
-msgid "Maildir-format mail directories"
-msgstr "Directorios de correo en formato Maildir"
-
-#: camel/providers/local/camel-local-provider.c:84
-msgid "For storing local mail in maildir directories."
-msgstr "Para guardar el correo local en directorios del tipo maildir."
-
-#: camel/providers/local/camel-local-provider.c:95
-msgid "Store status headers in Elm/Pine/Mutt format"
-msgstr "Almacenar cabeceras de estado en formato Elm/Pine/Mutt"
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "Standard Unix mbox spool or directory"
-msgstr "Mbox estándar de Unix"
-
-#: camel/providers/local/camel-local-provider.c:102
-msgid ""
-"For reading and storing local mail in external standard mbox spool files.\n"
-"May also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr ""
-"Para leer y guardar el correo local en directorios externos estándar mbox.\n"
-"También puede ser usado para leer un árbol del estilo de carpetas de Elm, "
-"Pine o Mutt."
-
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:355
-#: camel/providers/local/camel-spool-store.c:116
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "El almacén raíz %s no es una ruta absoluta"
-
-#: camel/providers/local/camel-local-store.c:149
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "El almacén raíz %s no es un directorio regular"
-
-#: camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-local-store.c:166
-#: camel/providers/local/camel-local-store.c:264
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "No se pudo acceder a la carpeta: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:178
-msgid "Local stores do not have an inbox"
-msgstr "Los almacenes locales no tienen una bandeja de entrada"
-
-#: camel/providers/local/camel-local-store.c:224
-#, c-format
-msgid "Local mail file %s"
-msgstr "Archivo de correo local %s"
-
-#: camel/providers/local/camel-local-store.c:333
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "No se pudo cambiar el nombre de la carpeta %s a %s: %s"
-
-#: camel/providers/local/camel-local-store.c:398
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "No se pudo renombrar: «%s»: %s"
-
-#: camel/providers/local/camel-local-store.c:423
-#: camel/providers/local/camel-mbox-store.c:284
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "No se pudo borrar el resumen la carpeta «%s»: %s"
-
-#: camel/providers/local/camel-local-store.c:433
-#: camel/providers/local/camel-mbox-store.c:296
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "No se pudo borrar el índice de la carpeta «%s»: %s"
-
-#: camel/providers/local/camel-local-store.c:456
-#: camel/providers/local/camel-mbox-store.c:320
-#, c-format
-msgid "Could not delete folder meta file `%s': %s"
-msgstr "No se pudieron borrar los metadatos de la carpeta «%s»: %s"
-
-#: camel/providers/local/camel-local-summary.c:405
-#, c-format
-msgid "Could not save summary: %s: %s"
-msgstr "No se pudo guardar el resumen: %s: %s"
-
-#: camel/providers/local/camel-local-summary.c:464
-msgid "Unable to add message to summary: unknown reason"
-msgstr "No se pudo añadir mensajes al resumen: razón desconocida"
-
-#. Inbox is always first
-#: camel/providers/local/camel-maildir-folder.c:74
-#: camel/providers/local/camel-maildir-store.c:232
-#: camel/providers/local/camel-maildir-store.c:248
-#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
-msgid "Inbox"
-msgstr "Bandeja de entrada"
-
-#: camel/providers/local/camel-maildir-folder.c:214
-msgid "Maildir append message cancelled"
-msgstr "Mensaje añadido al Maildir cancelado"
-
-#: camel/providers/local/camel-maildir-folder.c:217
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "No se pudo añadir el mensaje a la carpeta tipo maildir: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:243
-#: camel/providers/local/camel-maildir-folder.c:257
-#: camel/providers/local/camel-maildir-folder.c:266
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mbox-folder.c:436
-#: camel/providers/local/camel-mbox-folder.c:467
-#: camel/providers/local/camel-mbox-folder.c:475
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-mh-folder.c:221
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"No se pudo obtener el mensaje; %s de la carpeta %s\n"
-"  %s"
-
-#
-#: camel/providers/local/camel-maildir-folder.c:267
-msgid "Invalid message contents"
-msgstr "Contenido inválido en el mensaje"
-
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:204
-#, c-format
-msgid "Cannot get folder `%s': %s"
-msgstr "No se pudo acceder a la carpeta: «%s»: %s"
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:211
-#, c-format
-msgid "Cannot get folder `%s': folder does not exist."
-msgstr "No se puede obtener la carpeta «%s»: la carpeta no existe."
-
-#: camel/providers/local/camel-maildir-store.c:121
-#: camel/providers/local/camel-mbox-store.c:184
-#: camel/providers/local/camel-mbox-store.c:196
-#, c-format
-msgid "Cannot create folder `%s': %s"
-msgstr "No se pudo crear la carpeta: «%s»: %s"
-
-#: camel/providers/local/camel-maildir-store.c:136
-#, c-format
-msgid "Cannot get folder `%s': not a maildir directory."
-msgstr "No se puede obtener la carpeta «%s»: no es un directorio tipo maildir."
-
-#: camel/providers/local/camel-maildir-store.c:175
-#: camel/providers/local/camel-maildir-store.c:213
-#: camel/providers/local/camel-mh-store.c:260
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "No se pudo borrar la carpeta «%s»: %s"
-
-#: camel/providers/local/camel-maildir-store.c:177
-msgid "not a maildir directory"
-msgstr "no es un directorio tipo maildir"
-
-#: camel/providers/local/camel-maildir-store.c:355
-#: camel/providers/local/camel-spool-store.c:284
-#: camel/providers/local/camel-spool-store.c:314
-#, c-format
-msgid "Could not scan folder `%s': %s"
-msgstr "No se pudo analizar la carpeta «%s»: %s"
-
-#: camel/providers/local/camel-maildir-summary.c:419
-#: camel/providers/local/camel-maildir-summary.c:550
-#, c-format
-msgid "Cannot open maildir directory path: %s: %s"
-msgstr "No se pudo abrir el maildir en esta ruta: %s: %s"
-
-#: camel/providers/local/camel-maildir-summary.c:543
-msgid "Checking folder consistency"
-msgstr "Comprobando la consistencia de la carpeta"
-
-#: camel/providers/local/camel-maildir-summary.c:646
-msgid "Checking for new messages"
-msgstr "Comprobando si hay mensajes nuevos"
-
-#: camel/providers/local/camel-maildir-summary.c:735
-#: camel/providers/local/camel-mbox-summary.c:369
-#: camel/providers/local/camel-mbox-summary.c:542
-#: camel/providers/local/camel-mbox-summary.c:633
-#: camel/providers/local/camel-spool-summary.c:137
-msgid "Storing folder"
-msgstr "Guardando carpeta"
-
-#: camel/providers/local/camel-mbox-folder.c:225
-#: camel/providers/local/camel-spool-folder.c:148
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "No se pudo crear un bloqueo de carpetas en %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:284
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "No se pudo abrir el buzón: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:344
-msgid "Mail append cancelled"
-msgstr "Adición de mensaje cancelada"
-
-#: camel/providers/local/camel-mbox-folder.c:347
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "No se pudo añadir el mensaje al archivo mbox: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:468
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "La carpeta parece estar corrompida e irrecuperable."
-
-#: camel/providers/local/camel-mbox-folder.c:476
-#: camel/providers/local/camel-mh-folder.c:222
-msgid "Message construction failed."
-msgstr "Falló la construcción del mensaje."
-
-#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
-msgid "Cannot create a folder by this name."
-msgstr "No se pudo crear una carpeta con ese nombre."
-
-#: camel/providers/local/camel-mbox-store.c:206
-#, c-format
-msgid "Cannot get folder `%s': not a regular file."
-msgstr "No se pudo obtener la carpeta «%s»: no es un archivo regular."
-
-#: camel/providers/local/camel-mbox-store.c:236
-#: camel/providers/local/camel-mbox-store.c:247
-#: camel/providers/local/camel-mbox-store.c:270
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"No se pudo borrar la carpeta «%s»:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:255
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "«%s» no es un archivo normal."
-
-#: camel/providers/local/camel-mbox-store.c:262
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "La carpeta «%s» no esta vacía. No fue borrada."
-
-#: camel/providers/local/camel-mbox-store.c:374
-#, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "No se pudo crear el directorio «%s»: %s."
-
-#: camel/providers/local/camel-mbox-store.c:388
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "No se pudo crear la carpeta: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:390
-msgid "Folder already exists"
-msgstr "La carpeta ya existe"
-
-#: camel/providers/local/camel-mbox-store.c:472
-msgid "The new folder name is illegal."
-msgstr "El nombre de carpeta nuevo es ilegal."
-
-#: camel/providers/local/camel-mbox-store.c:485
-#, c-format
-msgid "Could not rename `%s': `%s': %s"
-msgstr "No se pudo renombrar: «%s»: «%s» : %s"
-
-#: camel/providers/local/camel-mbox-store.c:560
-#, c-format
-msgid "Could not rename '%s' to %s: %s"
-msgstr "No se pudo renombrar «%s» a %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:375
-#, c-format
-msgid "Could not open folder: %s: %s"
-msgstr "No se pudo abrir la carpeta: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:423
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Análisis erróneo del correo cerca de la posición %ld en la carpeta %s"
-
-#: camel/providers/local/camel-mbox-summary.c:479
-#, c-format
-msgid "Cannot check folder: %s: %s"
-msgstr "No se pudo comprobar la carpeta: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:547
-#: camel/providers/local/camel-mbox-summary.c:638
-#: camel/providers/local/camel-spool-summary.c:142
-#, c-format
-msgid "Could not open file: %s: %s"
-msgstr "No se pudo abrir el archivo %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:559
-#: camel/providers/local/camel-spool-summary.c:162
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "No se pudo abrir el archivo de correo temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:572
-#: camel/providers/local/camel-mbox-summary.c:736
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "No se pudo cerrar la carpeta origen %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:581
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "No se pudo cerrar la carpeta temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:592
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "No se pudo cambiar el nombre a la carpeta: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:676
-#: camel/providers/local/camel-mbox-summary.c:684
-#: camel/providers/local/camel-mbox-summary.c:877
-#: camel/providers/local/camel-mbox-summary.c:885
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Resumen y carpeta no concuerdan, incluso después de una sincronización"
-
-#: camel/providers/local/camel-mbox-summary.c:811
-#: camel/providers/local/camel-spool-summary.c:334
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Error desconocido: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:846
-#, c-format
-msgid "Could not store folder: %s"
-msgstr "No se pudo almacenar carpeta:: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:940
-#: camel/providers/local/camel-mbox-summary.c:966
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Error la escribir al archivo de correo temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:957
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Error la escribir al archivo temporal: %s: %s"
-
-#
-#: camel/providers/local/camel-mh-folder.c:174
-msgid "MH append message cancelled"
-msgstr "Adición de mensaje en el MH cancelada"
-
-#: camel/providers/local/camel-mh-folder.c:177
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "No se pudo añadir el mensaje a la carpeta mh: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:219
-#, c-format
-msgid "Could not create folder `%s': %s"
-msgstr "No se pudo crear la carpeta «%s»: %s"
-
-#: camel/providers/local/camel-mh-store.c:231
-#, c-format
-msgid "Cannot get folder `%s': not a directory."
-msgstr "No se pudo acceder a la carpeta: «%s»: no es un directorio."
-
-#: camel/providers/local/camel-mh-summary.c:244
-#, c-format
-msgid "Cannot open MH directory path: %s: %s"
-msgstr "No se pudo abrir el directorio MH en la ruta: %s: %s"
-
-#: camel/providers/local/camel-spool-store.c:122
-#, c-format
-msgid "Spool `%s' cannot be opened: %s"
-msgstr "La cola «%s» no pudo abrirse: %s"
-
-#: camel/providers/local/camel-spool-store.c:134
-#, c-format
-msgid "Spool `%s' is not a regular file or directory"
-msgstr "El spool «%s» no es un directorio o archivo normal"
-
-#: camel/providers/local/camel-spool-store.c:153
-#, c-format
-msgid "Folder `%s/%s' does not exist."
-msgstr "La carpeta «%s/%s» no existe."
-
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"No se pudo abrir la carpeta «%s»:\n"
-"%s"
-
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "La carpeta «%s» no existe."
-
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"No se pudo crear la carpeta «%s»:\n"
-"%s"
-
-#: camel/providers/local/camel-spool-store.c:180
-#, c-format
-msgid "`%s' is not a mailbox file."
-msgstr "«%s» no es un archivo mailbox."
-
-#: camel/providers/local/camel-spool-store.c:197
-msgid "Store does not support an INBOX"
-msgstr "El almacén no soporta una bandeja de entrada"
-
-#: camel/providers/local/camel-spool-store.c:209
-#, c-format
-msgid "Spool mail file %s"
-msgstr "Archivo de cola de correo %s"
-
-#: camel/providers/local/camel-spool-store.c:209
-#, c-format
-msgid "Spool folder tree %s"
-msgstr "Árbol de carpetas de colas %s"
-
-#: camel/providers/local/camel-spool-store.c:217
-msgid "Spool folders cannot be renamed"
-msgstr "Las carpetas de correo no pueden ser renombradas"
-
-#: camel/providers/local/camel-spool-store.c:225
-msgid "Spool folders cannot be deleted"
-msgstr "Las carpetas de correo no pueden ser borradas"
-
-#: camel/providers/local/camel-spool-summary.c:175
-#: camel/providers/local/camel-spool-summary.c:185
-#: camel/providers/local/camel-spool-summary.c:195
-#, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "No se pudo sincronizar la carpeta temporal %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:211
-#, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "No se pudo sincronizar la carpeta de correo %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:242
-#: camel/providers/local/camel-spool-summary.c:261
-#: camel/providers/local/camel-spool-summary.c:274
-#, c-format
-msgid ""
-"Could not sync spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in `%s'"
-msgstr ""
-"No se pudo sincronizar la carpeta de correo %s: %s\n"
-"La carpeta puede estar corrupta, copia guardada en «%s»"
+msgid "%.0fK"
+msgstr "%.0fKib"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:1126
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Escriba la contraseña NNTP para %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "El servidor rechazó el nombre de usuario"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Falló al enviar el nombre de usuario al servidor"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "El servidor rechazó el nombre de usuario/contraseña"
-
-#: camel/providers/nntp/camel-nntp-folder.c:147
-#: camel/providers/nntp/camel-nntp-folder.c:149
-#: camel/providers/nntp/camel-nntp-folder.c:158
-#: camel/providers/nntp/camel-nntp-folder.c:234
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "No se pudo obtener mensaje %s: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:156
-#: camel/providers/nntp/camel-nntp-folder.c:232
-#: camel/providers/nntp/camel-nntp-folder.c:371
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "El usuario canceló"
-
-#: camel/providers/nntp/camel-nntp-folder.c:176
-#: camel/providers/nntp/camel-nntp-folder.c:208
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Error interno: uid en formato inválido: %s"
+msgid "%.0fM"
+msgstr "%.0fMib"
 
-#: camel/providers/nntp/camel-nntp-folder.c:328
-#: camel/providers/nntp/camel-nntp-folder.c:331
-#: camel/providers/nntp/camel-nntp-folder.c:373
-#: camel/providers/nntp/camel-nntp-folder.c:375
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
-msgid "Posting failed: %s"
-msgstr "La publicación falló: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:393
-msgid "You cannot post NNTP messages while working offline!"
-msgstr "No puede publicar mensajes NNTP mientras trabaja desconectado."
+msgid "%.0fG"
+msgstr "%.0fGib"
 
-#: camel/providers/nntp/camel-nntp-folder.c:404
-msgid "You cannot copy messages from a NNTP folder!"
-msgstr "No puede copiar mensajes desde una carpeta NNTP."
+#: composer/e-msg-composer-attachment-bar.c:293 mail/em-utils.c:436
+msgid "attachment"
+msgstr "adjunto"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:44
-msgid "Could not get group list from server."
-msgstr "No se pudo obtener la lista de grupo del servidor."
+#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2762
+#: ui/evolution-mail-list.xml.h:27
+msgid "_Properties"
+msgstr "_Propiedades"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:97
-#: camel/providers/nntp/camel-nntp-grouplist.c:106
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "No se pudo cargar el archivo de lista de grupo: %s: %s"
+#: composer/e-msg-composer-attachment-bar.c:443
+msgid "_Add attachment..."
+msgstr "_Añadir adjunto..."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:157
+#: composer/e-msg-composer-attachment.c:174
+#: composer/e-msg-composer-attachment.c:190
 #, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "No se pudo guardar el archivo de lista de grupo para %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:43
-msgid ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
-"Mostrar carpetas en notación corta (ej: c.o.linux en vez de comp.os.linux)"
-
-#: camel/providers/nntp/camel-nntp-provider.c:45
-msgid "In the subscription dialog, show relative folder names"
-msgstr "En el diálogo de subscripción, mostrar nombres de carpetas relativos"
-
-#: camel/providers/nntp/camel-nntp-provider.c:52
-msgid "USENET news"
-msgstr "Noticias USENET"
-
-#: camel/providers/nntp/camel-nntp-provider.c:54
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Este es un proveedor para leer y enviar noticias a grupos de USENET."
-
-#: camel/providers/nntp/camel-nntp-provider.c:73
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"Esta opción es para autenticarse con el servidor NNTP usando una contraseña "
-"de texto."
+msgid "Cannot attach file %s: %s"
+msgstr "No se pudo adjuntar el archivo %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:118
-#: camel/providers/nntp/camel-nntp-store.c:1233
-#: camel/providers/nntp/camel-nntp-store.c:1331
+#: composer/e-msg-composer-attachment.c:182
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "El comando NNTP ha fallado: %s"
+msgid "Cannot attach file %s: not a regular file"
+msgstr "No se pudo adjuntar el archivo %s: no es un archivo normal"
 
-#: camel/providers/nntp/camel-nntp-store.c:227
-#, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "No se pudo leer saludo desde %s: %s"
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "Propiedades de adjuntos"
 
-#: camel/providers/nntp/camel-nntp-store.c:239
-#, c-format
-msgid "NNTP server %s returned error code %d: %s"
-msgstr "El servidor NNTP %s devolvió un código de error %d %s"
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "Nombre del archivo:"
 
-#: camel/providers/nntp/camel-nntp-store.c:403
-#, c-format
-msgid "USENET News via %s"
-msgstr "Noticias USENET vía %s"
+#: composer/e-msg-composer-attachment.glade.h:5
+msgid "MIME type:"
+msgstr "Tipo MIME:"
 
-#: camel/providers/nntp/camel-nntp-store.c:777
-#, c-format
-msgid ""
-"Error retrieving newsgroups:\n"
-"\n"
-"%s"
-msgstr ""
-"Error al obtener los grupos de noticias:\n"
-"\n"
-"%s"
+#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-select-file.c:93
+#: composer/e-msg-composer-select-file.c:112
+msgid "Suggest automatic display of attachment"
+msgstr "Sugerir mostrar adjuntos automáticamente"
 
-#: camel/providers/nntp/camel-nntp-store.c:872
-msgid ""
-"You cannot subscribe to this newsgroup:\n"
-"\n"
-"No such newsgroup. The selected item is a probably a parent folder."
+#: composer/e-msg-composer.c:727
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
-"No puede suscribirse a este grupo de noticias:\n"
-"\n"
-"No existe dicho grupo. El elemento seleccionado probablemente es una carpeta "
-"madre."
+"No se puede firmar el mensaje saliente: No hay establecido un certificado de "
+"firma para esta cuenta"
 
-#: camel/providers/nntp/camel-nntp-store.c:904
+#: composer/e-msg-composer.c:734
 msgid ""
-"You cannot unsubscribe to this newsgroup:\n"
-"\n"
-"newsgroup does not exist!"
-msgstr ""
-"No puede suscribirse a este grupo de noticias:\n"
-"\n"
-"el grupo de noticias no existe."
-
-#: camel/providers/nntp/camel-nntp-store.c:929
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"No puede crear una carpeta en un almacén de noticias: suscríbase en su lugar."
-
-#: camel/providers/nntp/camel-nntp-store.c:937
-msgid "You cannot rename a folder in a News store."
-msgstr "No se puede renombrar una carpeta en un almacén de noticias."
-
-#: camel/providers/nntp/camel-nntp-store.c:945
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
 msgstr ""
-"No puede eliminar una carpeta en un almacén de noticias:desuscríbase en su "
-"lugar."
-
-#: camel/providers/nntp/camel-nntp-store.c:1118
-msgid "Authentication requested but not username provided"
-msgstr "Se solicito autenticación pero no se suministró un nombre de usuario"
-
-#: camel/providers/nntp/camel-nntp-store.c:1146
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "No se pudo autenticar con el servidor: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:1262
-msgid "Not connected."
-msgstr "No conectado."
-
-#: camel/providers/nntp/camel-nntp-store.c:1311
-#, c-format
-msgid "No such folder: %s"
-msgstr "No existe la carpeta %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:218
-#: camel/providers/nntp/camel-nntp-summary.c:314
-#, c-format
-msgid "%s: Scanning new messages"
-msgstr "%s: Buscando mensajes nuevos"
-
-#: camel/providers/nntp/camel-nntp-summary.c:225
-#, c-format
-msgid "Unexpected server response from xover: %s"
-msgstr "Respuesta inesperada del servidor desde xover: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:328
-#, c-format
-msgid "Unexpected server response from head: %s"
-msgstr "Respuesta inesperada del servidor desde head: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:368
-msgid "Use cancel"
-msgstr "Usar cancelar"
-
-#: camel/providers/nntp/camel-nntp-summary.c:370
-#, c-format
-msgid "Operation failed: %s"
-msgstr "Operación falló: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:246
-msgid "Retrieving POP summary"
-msgstr "Obteniendo resumen POP"
-
-#: camel/providers/pop3/camel-pop3-folder.c:265
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "No se pudo obtener el sumario POP: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:308
-msgid "Expunging deleted messages"
-msgstr "Eliminando los mensajes borrados"
-
-#: camel/providers/pop3/camel-pop3-folder.c:404
-#, c-format
-msgid "No message with uid %s"
-msgstr "No hay mensajes con uid %s"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Obteniendo mensaje POP %d"
+"No se puede cifrar el mensaje saliente: no hay establecido un certificado de "
+"cifrado para esta cuenta"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1210
-#: composer/e-msg-composer.c:1231
+#: composer/e-msg-composer.c:1233 composer/e-msg-composer.c:1254
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: camel/providers/pop3/camel-pop3-provider.c:40
-msgid "Leave messages on server"
-msgstr "Dejar mensajes en el servidor"
-
-#: camel/providers/pop3/camel-pop3-provider.c:43
-#, c-format
-msgid "Delete after %s day(s)"
-msgstr "Borrar tras %s día(s)"
-
-#: camel/providers/pop3/camel-pop3-provider.c:46
-msgid "Disable support for all POP3 extensions"
-msgstr "Desactivar soporte para todas las extensiones POP3"
-
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-msgid "For connecting to and downloading mail from POP servers."
-msgstr "Para conectarse y descargar correo de servidores POP."
-
-#: camel/providers/pop3/camel-pop3-provider.c:73
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"Esta opción es para conectar con servidores POP usando una contraseña en "
-"texto plano. Esta es la única opción implementada por muchos servidores POP."
-
-#: camel/providers/pop3/camel-pop3-provider.c:83
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"Esta opción es para conectar con servidores POP usando una contraseña "
-"cifrada por medio del protocolo APOP. Esto no funcionará para todos los "
-"usuarios ni siquiera en servidores que dicen implementarlo."
-
-#: camel/providers/pop3/camel-pop3-store.c:195
-#, c-format
-msgid "Could not connect to POP server %s (port %d): %s"
-msgstr "No se pudo conectar al servidor POP %s (puerto %d): %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Failed to read a valid greeting from POP server %s (port %d)"
-msgstr "No se pudo leer un saludo válido desde el servidor POP %s (puerto %d)"
-
-#: camel/providers/pop3/camel-pop3-store.c:232
-#: camel/providers/pop3/camel-pop3-store.c:261
-#: camel/providers/pop3/camel-pop3-store.c:273
-#, c-format
-msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "No se pudo conectar al servidor POP %s en modo seguro: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:371
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "No se pudo conectar con el servidor POP: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:412
-#: camel/providers/pop3/camel-pop3-store.c:526
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"No se pudo conectar con el servidor POP %s: \n"
-"No hay soporte para el sistema de autenticación pedido."
-
-#: camel/providers/pop3/camel-pop3-store.c:428
-#, c-format
-msgid "SASL `%s' Login failed for POP server %s: %s"
-msgstr "SASL «%s» Falló el inicio de sesión para servidor POP %s: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:440
-#, c-format
-msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr ""
-"No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
-
-#: camel/providers/pop3/camel-pop3-store.c:459
-#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "No se pudo autenticarme en el servidor POP %s: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:485
-#, c-format
-msgid "%sPlease enter the POP password for %s on host %s"
-msgstr "%s Escriba la contraseña POP para %s en el servidor %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:540
-#: camel/providers/pop3/camel-pop3-store.c:553
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password: %s"
-msgstr ""
-"No se pudo conectar con el servidor POP %s.\n"
-"Error al enviar la contraseña: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:547
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending username: %s"
-msgstr ""
-"No se pudo conectar con el servidor POP %s.\n"
-"Error al enviar nombre de usuario: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:652
-#, c-format
-msgid "No such folder `%s'."
-msgstr "No existe la carpeta «%s»."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:132
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:113
-msgid "Could not parse recipient list"
-msgstr "No se pudo analizar la lista de destinatarios"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:144
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "No se pudo comunicar con sendmail: %s: correo no enviado"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "No se pudo hacer un bifurcar a sendmail: %s: correo no enviado"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:205
-#, c-format
-msgid "Could not send message: %s"
-msgstr "No se pudo enviar mensaje: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:233
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail finalizó con %s: correo no enviado."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:240
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "No se pudo ejecutar %s: correo no enviado."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail finalizó con estado %d: correo no enviado."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
-msgid "Mail delivery via the sendmail program"
-msgstr "Entregar correo por medio de sendmail"
-
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "Para entregar correo conectándose a un servidor de correo usando SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:174
-msgid "Syntax error, command unrecognized"
-msgstr "Error de sintaxis, comando no reconocido"
-
-#: camel/providers/smtp/camel-smtp-transport.c:176
-msgid "Syntax error in parameters or arguments"
-msgstr "Error de sintaxis en los parámetros o los argumentos"
-
-#: camel/providers/smtp/camel-smtp-transport.c:178
-msgid "Command not implemented"
-msgstr "Comando no implementado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:180
-msgid "Command parameter not implemented"
-msgstr "Parámetro del comando no implementado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:182
-msgid "System status, or system help reply"
-msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
-
-#: camel/providers/smtp/camel-smtp-transport.c:184
-msgid "Help message"
-msgstr "Mensaje de ayuda"
-
-#: camel/providers/smtp/camel-smtp-transport.c:186
-msgid "Service ready"
-msgstr "Servicio preparado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:188
-msgid "Service closing transmission channel"
-msgstr "Servicio cerrando los canales de transmisión"
-
-#: camel/providers/smtp/camel-smtp-transport.c:190
-msgid "Service not available, closing transmission channel"
-msgstr "Servicio no disponible, cerrando los canales de transmisión"
-
-#: camel/providers/smtp/camel-smtp-transport.c:192
-msgid "Requested mail action okay, completed"
-msgstr "Acción de correo requerida en orden, completada"
-
-#: camel/providers/smtp/camel-smtp-transport.c:194
-msgid "User not local; will forward to <forward-path>"
-msgstr "El usuario no es local; se reenviará a <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:196
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-"Acción solicitada del correo no realizada: el mailbox no está disponible"
-
-#: camel/providers/smtp/camel-smtp-transport.c:198
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Acción solicitada no realizada: el mailbox no está disponible"
-
-#: camel/providers/smtp/camel-smtp-transport.c:200
-msgid "Requested action aborted: error in processing"
-msgstr "Acción solicitada abortada: error en procesamiento"
-
-#: camel/providers/smtp/camel-smtp-transport.c:202
-msgid "User not local; please try <forward-path>"
-msgstr "El usuario no es local; pruebe con <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:204
-msgid "Requested action not taken: insufficient system storage"
-msgstr ""
-"Acción solicitada no realizada: la capacidad del sistema es insuficiente"
-
-#: camel/providers/smtp/camel-smtp-transport.c:206
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Acción solicitada no realizada: excedió la capacidad de almacenamiento"
-
-#: camel/providers/smtp/camel-smtp-transport.c:208
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Acción solicitada no realizada: nombre no permitido para mailbox"
-
-#: camel/providers/smtp/camel-smtp-transport.c:210
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:212
-msgid "Transaction failed"
-msgstr "Falló en la transacción"
+#: composer/e-msg-composer.c:1291
+msgid "Could not open file"
+msgstr "No se pudo abrir el archivo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
-msgid "A password transition is needed"
-msgstr "Es necesaria una transición de contraseña"
+#: composer/e-msg-composer.c:1299
+msgid "Unable to retrieve message from editor"
+msgstr "No se pudo obtener el mensaje del editor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
-msgid "Authentication mechanism is too weak"
-msgstr "El método de autenticación es demasiado débil"
+#: composer/e-msg-composer.c:1569
+msgid "Untitled Message"
+msgstr "Mensaje sin título"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Encryption required for requested authentication mechanism"
-msgstr "Cifrado requerida por el mecanismo de autenticación pedido"
+#: composer/e-msg-composer.c:1599
+msgid "Open file"
+msgstr "Abrir archivo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
-msgid "Temporary authentication failure"
-msgstr "Falló temporal en la autenticación"
+#: composer/e-msg-composer.c:2006 mail/em-account-editor.c:578
+#: mail/em-account-editor.c:623 mail/em-account-editor.c:690
+msgid "Autogenerated"
+msgstr "Auto-generado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
-msgid "Authentication required"
-msgstr "Autenticación requerida"
+#: composer/e-msg-composer.c:2105
+msgid "Si_gnature:"
+msgstr "_Firma:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:308
-msgid "Welcome response error"
-msgstr "Error en la respuesta de bienvenida"
+#: composer/e-msg-composer.c:2364 composer/e-msg-composer.c:3355
+#: composer/e-msg-composer.c:3356
+msgid "Compose a message"
+msgstr "Redactar un mensaje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: composer/e-msg-composer.c:2671
 #, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Falló al conectar al servidor SMTP %s en modo seguro: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:344
-msgid "server does not appear to support SSL"
-msgstr "el servidor no parece soportar SSL"
+msgid "Attached message - %s"
+msgstr "Mensaje adjunto - %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2676 composer/e-msg-composer.c:2839
 #, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "El comando STARTTLS ha fallado: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS command failed"
-msgstr "El comando STARTTLS ha fallado"
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "%d mensaje adjunto"
+msgstr[1] "%d mensajes adjuntos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr ""
-"El servidor SMTP %s no implementa el método de autenticación requerido %s."
+#: composer/e-msg-composer.c:2902 mail/em-folder-tree.c:1037
+#: mail/em-folder-tree.c:2255 mail/em-folder-view.c:834
+#: mail/message-list.c:1713
+msgid "_Move"
+msgstr "_Mover"
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
-#, c-format
-msgid "%sPlease enter the SMTP password for %s on host %s"
-msgstr "%s Escriba la contraseña SMTP para %s en el host %s"
+#: composer/e-msg-composer.c:2904 mail/em-folder-tree.c:1039
+#: mail/message-list.c:1715
+msgid "Cancel _Drag"
+msgstr "Cancelar _arrastre"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
-#, c-format
+#: composer/e-msg-composer.c:4536
 msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"No se pudo autenticarme en el servidor SMTP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:657
-#, c-format
-msgid "SMTP server %s"
-msgstr "Servidor SMTP %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:659
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Envío de correo SMTP vía %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:677
-msgid "Cannot send message: service not connected."
-msgstr "No se pudo enviar el mensaje: servicio no conectado."
-
-#: camel/providers/smtp/camel-smtp-transport.c:683
-msgid "Cannot send message: sender address not valid."
-msgstr "No se pudo enviar el mensaje: dirección del remitente no válida."
-
-#: camel/providers/smtp/camel-smtp-transport.c:687
-msgid "Sending message"
-msgstr "Enviando mensaje"
-
-#: camel/providers/smtp/camel-smtp-transport.c:702
-msgid "Cannot send message: no recipients defined."
-msgstr "No se pudo enviar el mensaje: no hay destinatarios."
-
-#: camel/providers/smtp/camel-smtp-transport.c:713
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "No se pudo enviar el mensaje: uno o más destinatarios inválidos"
-
-#: camel/providers/smtp/camel-smtp-transport.c:885
-msgid "SMTP Greeting"
-msgstr "Saludo del SMTP"
-
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "El comando HELO ha fallado: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:951
-msgid "HELO command failed"
-msgstr "El comando HELO ha fallado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1017
-msgid "SMTP Authentication"
-msgstr "Autenticación SMTP"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-msgid "Error creating SASL authentication object."
-msgstr "Error al crear el objeto de autenticación SASL."
-
-#: camel/providers/smtp/camel-smtp-transport.c:1040
-#: camel/providers/smtp/camel-smtp-transport.c:1051
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "El comando AUTH ha fallado: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1057
-msgid "AUTH command failed"
-msgstr "El comando AUTH ha fallado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1119
-msgid "Bad authentication response from server.\n"
-msgstr "Respuesta de autenticación errónea desde el servidor.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1144
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "El comando MAIL FROM ha fallado: %s: correo no enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1161
-msgid "MAIL FROM command failed"
-msgstr "El comando MAIL FROM ha fallado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1185
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "El comando RCPT TO ha fallado: %s: correo no enviado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1204
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "Falló RCPT TO <%s>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1243
-#: camel/providers/smtp/camel-smtp-transport.c:1301
-#: camel/providers/smtp/camel-smtp-transport.c:1320
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "El comando DATA ha fallado: %s: correo no enviado"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: camel/providers/smtp/camel-smtp-transport.c:1260
-#: camel/providers/smtp/camel-smtp-transport.c:1336
-msgid "DATA command failed"
-msgstr "El comando DATA ha fallado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1359
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "El comando RSET ha fallado: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1375
-msgid "RSET command failed"
-msgstr "El comando RSET ha fallado"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1398
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "El comando QUIT ha fallado: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1412
-msgid "QUIT command failed"
-msgstr "El comando QUIT ha fallado"
-
-#: composer/e-msg-composer-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: composer/e-msg-composer-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: composer/e-msg-composer-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:436
-msgid "attachment"
-msgstr "adjunto"
-
-#: composer/e-msg-composer-attachment-bar.c:454
-msgid "Remove selected items from the attachment list"
-msgstr "Quitar los elementos seleccionados de la lista de adjuntos"
-
-#: composer/e-msg-composer-attachment-bar.c:494
-msgid "Add attachment..."
-msgstr "Incluir adjunto..."
-
-#: composer/e-msg-composer-attachment-bar.c:495
-msgid "Attach a file to the message"
-msgstr "Adjuntar un archivo al mensaje"
-
-#: composer/e-msg-composer-attachment.c:173
-#: composer/e-msg-composer-attachment.c:189
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "No se pudo adjuntar el archivo %s: %s"
-
-#: composer/e-msg-composer-attachment.c:181
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "No se pudo adjuntar el archivo %s: no es un archivo normal"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Propiedades de adjuntos"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Nombre del archivo:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "Tipo MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:92
-#: composer/e-msg-composer-select-file.c:111
-msgid "Suggest automatic display of attachment"
-msgstr "Sugerir mostrar adjuntos automáticamente"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
 
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
@@ -12101,44 +9266,44 @@ msgstr "Pulse aquí para acceder a la libreta de direcciones"
 #. * expects the reply_to fields to be initialized.
 #.
 #: composer/e-msg-composer-hdrs.c:577
-msgid "Reply-To:"
-msgstr "Responder a:"
+msgid "_Reply-To:"
+msgstr "_Responder a:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:583
-msgid "From:"
-msgstr "De:"
+#: composer/e-msg-composer-hdrs.c:584
+msgid "Fr_om:"
+msgstr "_De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:589
-msgid "Subject:"
-msgstr "Asunto:"
+#: composer/e-msg-composer-hdrs.c:591
+msgid "S_ubject:"
+msgstr "_Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:598
-msgid "To:"
-msgstr "Para:"
+#: composer/e-msg-composer-hdrs.c:601
+msgid "_To:"
+msgstr "_Para:"
 
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:602
-msgid "Cc:"
-msgstr "Cc:"
+#: composer/e-msg-composer-hdrs.c:605
+msgid "_Cc:"
+msgstr "_Cc:"
 
-#: composer/e-msg-composer-hdrs.c:603
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:606
-msgid "Bcc:"
-msgstr "Cco:"
+#: composer/e-msg-composer-hdrs.c:609
+msgid "_Bcc:"
+msgstr "_Cco:"
 
-#: composer/e-msg-composer-hdrs.c:607
+#: composer/e-msg-composer-hdrs.c:610
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -12149,97 +9314,22 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:614
-msgid "Post To:"
-msgstr "Publicar en:"
+#: composer/e-msg-composer-hdrs.c:617
+msgid "_Post To:"
+msgstr "_Publicar en:"
 
-#: composer/e-msg-composer-hdrs.c:619
+#: composer/e-msg-composer-hdrs.c:622
 msgid "Click here to select folders to post to"
 msgstr "Pulse aquí para seleccionar las carpetas en las que publicar"
 
-#: composer/e-msg-composer-select-file.c:186
+#: composer/e-msg-composer-hdrs.c:628
+msgid "Post To:"
+msgstr "Publicar en:"
+
+#: composer/e-msg-composer-select-file.c:187
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"No se puede firmar el mensaje saliente: No hay establecido un certificado de "
-"firma para esta cuenta"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"No se puede cifrar el mensaje saliente: no hay establecido un certificado de "
-"cifrado para esta cuenta"
-
-#: composer/e-msg-composer.c:1268
-msgid "Could not open file"
-msgstr "No se pudo abrir el archivo"
-
-#: composer/e-msg-composer.c:1276
-msgid "Unable to retrieve message from editor"
-msgstr "No se pudo obtener el mensaje del editor"
-
-#: composer/e-msg-composer.c:1546
-msgid "Untitled Message"
-msgstr "Mensaje sin título"
-
-#: composer/e-msg-composer.c:1576
-msgid "Open file"
-msgstr "Abrir archivo"
-
-#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Auto-generado"
-
-#: composer/e-msg-composer.c:2082
-msgid "Signature:"
-msgstr "Firma:"
-
-#: composer/e-msg-composer.c:2283
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> archivo adjunto"
-msgstr[1] "<b>%d</b> archivos adjuntos"
-
-#: composer/e-msg-composer.c:2312
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Ocultar barra de _adjuntos (soltar adjuntos aquí)"
-
-#: composer/e-msg-composer.c:2315 composer/e-msg-composer.c:3271
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Mostrar barra de _adjuntos (soltar adjuntos aquí)"
-
-#: composer/e-msg-composer.c:2332 composer/e-msg-composer.c:3163
-#: composer/e-msg-composer.c:3164
-msgid "Compose a message"
-msgstr "Redactar un mensaje"
-
-#: composer/e-msg-composer.c:2634
-#, c-format
-msgid "Attached message - %s"
-msgstr "Mensaje adjunto - %s"
-
-#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2639 composer/e-msg-composer.c:2783
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "%d mensaje adjunto"
-msgstr[1] "%d mensajes adjuntos"
-
-#: composer/e-msg-composer.c:4341
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
-
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
@@ -12248,8 +9338,7 @@ msgstr "No puede adjuntar el archivo «{0}» a este mensaje."
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 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."
+msgstr "El archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
 
 #. mail-composer:attach-directory primary
 #: composer/mail-composer-errors.xml.h:8
@@ -12277,8 +9366,8 @@ msgstr "No se pudo obtener un mensaje al que adjuntar desde {0}."
 #. system:no-save-file secondary
 #. system:no-load-file secondary
 #: composer/mail-composer-errors.xml.h:14
-#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:105
+#: mail/mail-errors.xml.h:117 widgets/misc/e-system-errors.xml.h:11
 #: widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
 msgstr "Porque «{1}»"
@@ -12330,8 +9419,7 @@ msgstr "Aviso: Mensaje modificado"
 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?"
+msgstr "¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
 
 #. mail-composer:exit-unsaved secondary
 #: composer/mail-composer-errors.xml.h:32
@@ -12344,9 +9432,13 @@ 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-errors.xml.h:33
+msgid "_Discard Changes"
+msgstr "_Descartar cambios"
+
 #: composer/mail-composer-errors.xml.h:34
-msgid "Save Message"
-msgstr "Guardar mensaje"
+msgid "_Save Message"
+msgstr "_Guardar mensaje"
 
 #. mail-composer:no-build-message primary
 #: composer/mail-composer-errors.xml.h:36
@@ -12356,8 +9448,7 @@ msgstr "No se pudo crear un mensaje."
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
-msgstr ""
-"Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
+msgstr "Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
 
 #. mail-composer:no-sig-file primary
 #: composer/mail-composer-errors.xml.h:40
@@ -12398,7 +9489,7 @@ msgstr ""
 "\n"
 "Asegúrese de que tiene la versión correcta de gtkhtml y libgtkthml instalada."
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:503
+#: data/evolution.desktop.in.in.h:1 shell/main.c:520
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -12532,11 +9623,15 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
-#: e-util/e-passwords.c:463
+#: e-util/eggtrayicon.c:119
+msgid "The orientation of the tray."
+msgstr "La orientación del panel de notificación."
+
+#: e-util/e-passwords.c:468
 msgid "_Remember this password"
 msgstr "_Recuerda esta contraseña"
 
-#: e-util/e-passwords.c:464
+#: e-util/e-passwords.c:469
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recordar esta clave durante el resto de esta sesión"
 
@@ -12620,7 +9715,7 @@ msgstr "%H:%M:%S"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1431 widgets/misc/e-dateedit.c:1697
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -12629,7 +9724,7 @@ msgstr "%I:%M %p"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
+#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1694
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12742,7 +9837,7 @@ msgstr "No se puede compilar la expresión regular «{1}»."
 
 #. filter:no-name primary
 #. mail:no-name-vfolder primary
-#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:219
 msgid "Missing name."
 msgstr "Falta el nombre."
 
@@ -12765,71 +9860,6 @@ msgstr "Elija otro nombre."
 msgid "Choose a file"
 msgstr "Elija un archivo"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
-msgid "Important"
-msgstr "Importante"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:148
-msgid "To Do"
-msgstr "Tareas pendientes"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "Más tarde"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Prueba"
-
-#: filter/filter-rule.c:790
-msgid "Rule name:"
-msgstr "Nombre de la regla:"
-
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
-msgstr "<b>Si</b>"
-
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
-msgstr "si se cumplen todos los criterios"
-
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
-msgstr "si se cumple algún criterio"
-
-#: filter/filter-rule.c:856
-msgid "Execute actions"
-msgstr "Ejecutar acciones"
-
-#: filter/filter-rule.c:877
-msgid "All related"
-msgstr "Todos los relacionados"
-
-#: filter/filter-rule.c:877
-msgid "Replies"
-msgstr "Respuesta"
-
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
-msgstr "Respuestas y antecesores"
-
-#: filter/filter-rule.c:879
-msgid "Include threads"
-msgstr "Incluir conversaciones"
-
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "entrante"
-
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "saliente"
-
 #: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>Reglas para los _filtros</b>"
@@ -12838,62 +9868,127 @@ msgstr "<b>Reglas para los _filtros</b>"
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: filter/filter.glade.h:3
+#: filter/filter.glade.h:3 filter/filter-rule.c:975
 msgid "Incoming"
 msgstr "Entrando"
 
 #: filter/filter.glade.h:4
+msgid "Show filters for mail:"
+msgstr "Mostrar filtros para el correo:"
+
+#: filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
-"La fecha del mensaje será comparada contra las\n"
+"La fecha del mensaje se comparará contra las\n"
 "12:00am de la fecha especificada aquí."
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
-"La fecha del mensaje será comparada con una\n"
+"La fecha del mensaje se comparará con una\n"
 "fecha relativa al momento de ejecutar el filtro."
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
-"La fecha del mensaje será comparada con la\n"
+"La fecha del mensaje se comparará con la\n"
 "fecha actual cuando el filtrado se realice."
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "una fecha relativa al momento actual"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:13
 msgid "ago"
 msgstr "hace"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:17
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+#: filter/filter.glade.h:18 mail/mail-config.glade.h:173
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:19
 msgid "the current time"
 msgstr "la fecha actual"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:20
 msgid "the time you specify"
-msgstr "Una fecha a especificar"
+msgstr "la fecha que especificó"
 
-#: filter/filter.glade.h:21
+#: filter/filter.glade.h:22
 msgid "years"
 msgstr "años"
 
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:75 mail/mail-config.glade.h:91
+msgid "Important"
+msgstr "Importante"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:78
+#: mail/mail-config.glade.h:139
+msgid "To Do"
+msgstr "Tareas pendientes"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:79
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "Más tarde"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Prueba"
+
+#: filter/filter-rule.c:790
+msgid "_Rule name:"
+msgstr "Nombre de la _regla:"
+
+#: filter/filter-rule.c:818
+msgid "<b>If</b>"
+msgstr "<b>Si</b>"
+
+#: filter/filter-rule.c:855
+msgid "if all criteria are met"
+msgstr "si se cumplen todos los criterios"
+
+#: filter/filter-rule.c:855
+msgid "if any criteria are met"
+msgstr "si se cumple algún criterio"
+
+#: filter/filter-rule.c:857
+msgid "Execute actions"
+msgstr "Ejecutar acciones"
+
+#: filter/filter-rule.c:878
+msgid "All related"
+msgstr "Todos los relacionados"
+
+#: filter/filter-rule.c:878
+msgid "Replies"
+msgstr "Respuesta"
+
+#: filter/filter-rule.c:878
+msgid "Replies and parents"
+msgstr "Respuestas y antecesores"
+
+#: filter/filter-rule.c:880
+msgid "Include threads"
+msgstr "Incluir conversaciones"
+
+#: filter/filter-rule.c:975
+msgid "Outgoing"
+msgstr "Saliente"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Añadir regla"
@@ -12906,110 +10001,92 @@ msgstr "Editar regla"
 msgid "Rule name"
 msgstr "Nombre de la regla"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferencias del editor"
+#: mail/em-account-editor.c:377
+#, c-format
+msgid "%s License Agreement"
+msgstr "Acuerdo de Licencia %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-account-editor.c:384
+#, c-format
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
 msgstr ""
-"Configure las preferencias de correo incluyendo seguridad y visualización de "
-"mensajes, aquí"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure la ortografía, firmas y el editor de mensajes aquí"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure sus cuentas de correo aquí"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Control de configuración de cuentas de correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Componente de correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Redactor de correo de Evolution"
+"\n"
+"Por favor, lea cuidadosamente el acuerdo de licencia\n"
+"para %s mostrado abajo\n"
+"y marque la casilla para aceptarlo.\n"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Control de configuración del redactor de correo de Evolution"
+#: mail/em-account-editor.c:454 mail/em-filter-folder-element.c:237
+#: mail/em-vfolder-rule.c:494
+msgid "Select Folder"
+msgstr "Seleccionar carpeta"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail preferences control"
-msgstr "Control de preferencias de Evolution"
+#: mail/em-account-editor.c:1813
+msgid "Automatically check for _new mail every"
+msgstr "_Comprobar si hay correo nuevo automáticamente cada"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:419
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
-#: mail/mail-component.c:561
-msgid "Mail"
-msgstr "Correo"
+#. Most sections for this is auto-generated fromt the camel config
+#: mail/em-account-editor.c:2082 mail/em-account-editor.c:2160
+msgid "Receiving Options"
+msgstr "Opciones de recepción"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Mail Accounts"
-msgstr "Cuentas de correo"
+#: mail/em-account-editor.c:2083 mail/em-account-editor.c:2161
+msgid "Checking for New Mail"
+msgstr "Comprobación de correo nuevo"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Opciones de correo"
+#: mail/em-account-editor.c:2505 mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Editor de cuentas"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "_Mail"
-msgstr "Co_rreo"
+#: mail/em-account-editor.c:2505 mail/mail-config.glade.h:80
+msgid "Evolution Account Assistant"
+msgstr "Asistente de cuentas de Evolution"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:418
+#: mail/em-account-prefs.c:422
 msgid "[Default]"
 msgstr "[Predeterminada]"
 
-#: mail/em-account-prefs.c:472
+#: mail/em-account-prefs.c:476
 msgid "Account name"
 msgstr "Nombre de la cuenta"
 
-#: mail/em-account-prefs.c:474
+#: mail/em-account-prefs.c:478
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1045
+#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:425
+#: mail/mail-config.c:934
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: mail/em-composer-prefs.c:909
+#: mail/em-composer-prefs.c:949
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: mail/em-composer-prefs.c:955
+#: mail/em-composer-prefs.c:995
 msgid "Add signature script"
 msgstr "Añadir firma"
 
-#: mail/em-composer-prefs.c:975
+#: mail/em-composer-prefs.c:1015
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
-#: mail/em-composer-utils.c:889
+#: mail/em-composer-utils.c:910
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: mail/em-composer-utils.c:1502
+#: mail/em-composer-utils.c:1526
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1549
+#: mail/em-composer-utils.c:1573
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13021,11 +10098,6 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "Reglas para los _filtros"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Seleccionar carpeta"
-
 #. Automatically generated. Do not edit.
 #: mail/em-filter-i18n.h:2
 msgid "Adjust Score"
@@ -13151,11 +10223,16 @@ msgstr "no es"
 msgid "is not Flagged"
 msgstr "no está marcado"
 
+#: mail/em-filter-i18n.h:35 mail/mail-config.glade.h:93
+#: ui/evolution-mail-message.xml.h:48
+msgid "Junk"
+msgstr "Spam"
+
 #: mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr "Test de spam"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:932
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:971
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiquetar"
@@ -13165,109 +10242,113 @@ msgid "Mailing list"
 msgstr "Lista de correo"
 
 #: mail/em-filter-i18n.h:39
+msgid "Match All"
+msgstr "Coincidir con todo"
+
+#: mail/em-filter-i18n.h:40
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: mail/em-filter-i18n.h:40
+#: mail/em-filter-i18n.h:41
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: mail/em-filter-i18n.h:41
+#: mail/em-filter-i18n.h:42
 msgid "Message is Junk"
 msgstr "El mensaje es spam"
 
-#: mail/em-filter-i18n.h:42
+#: mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
 msgstr "El mensaje no es spam"
 
-#: mail/em-filter-i18n.h:43
+#: mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: mail/em-filter-i18n.h:44
+#: mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "Encauzar al programa"
 
-#: mail/em-filter-i18n.h:45
+#: mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "Reproducir un sonido"
 
-#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+#: mail/em-filter-i18n.h:47 mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Leído"
 
-#: mail/em-filter-i18n.h:47
+#: mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: mail/em-filter-i18n.h:48
+#: mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr "Expresión regular"
 
-#: mail/em-filter-i18n.h:49
+#: mail/em-filter-i18n.h:50
 msgid "Replied to"
 msgstr "Respondió a"
 
-#: mail/em-filter-i18n.h:50
+#: mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "devuelve"
 
-#: mail/em-filter-i18n.h:51
+#: mail/em-filter-i18n.h:52
 msgid "returns greater than"
 msgstr "devuelve mayor que"
 
-#: mail/em-filter-i18n.h:52
+#: mail/em-filter-i18n.h:53
 msgid "returns less than"
 msgstr "devuelve menor que"
 
-#: mail/em-filter-i18n.h:53
+#: mail/em-filter-i18n.h:54
 msgid "Run Program"
 msgstr "Ejecutar programa"
 
-#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+#: mail/em-filter-i18n.h:55 mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuación"
 
-#: mail/em-filter-i18n.h:55
+#: mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Remitente"
 
-#: mail/em-filter-i18n.h:56
+#: mail/em-filter-i18n.h:57
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: mail/em-filter-i18n.h:57
+#: mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "Tamaño (Kib)"
 
-#: mail/em-filter-i18n.h:58
+#: mail/em-filter-i18n.h:59
 msgid "sounds like"
 msgstr "suena como"
 
-#: mail/em-filter-i18n.h:59
+#: mail/em-filter-i18n.h:60
 msgid "Source Account"
 msgstr "Cuenta origen"
 
-#: mail/em-filter-i18n.h:60
+#: mail/em-filter-i18n.h:61
 msgid "Specific header"
 msgstr "Cabecera específica"
 
-#: mail/em-filter-i18n.h:61
+#: mail/em-filter-i18n.h:62
 msgid "starts with"
 msgstr "comienza por"
 
-#: mail/em-filter-i18n.h:63
+#: mail/em-filter-i18n.h:64
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1550
-#: mail/em-format-quote.c:305 mail/em-format.c:805 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1131
+#: mail/em-filter-i18n.h:65 mail/em-format.c:853 mail/em-format-html.c:1533
+#: mail/em-format-quote.c:306 mail/em-mailer-prefs.c:88
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
+#: plugins/shared-folder/properties.glade.h:14 smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Asunto"
 
-#: mail/em-filter-i18n.h:65
+#: mail/em-filter-i18n.h:66
 msgid "Unset Status"
 msgstr "Quitar estado"
 
@@ -13276,28 +10357,28 @@ msgstr "Quitar estado"
 msgid "<b>Then</b>"
 msgstr "<b>Entonces</b>"
 
-#: mail/em-folder-browser.c:129
+#: mail/em-folder-browser.c:133
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear una carpeta _virtual de la búsqueda..."
 
-#: mail/em-folder-properties.c:122
-msgid "Folder Properties"
-msgstr "Propiedades de la carpeta"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:161
+#: mail/em-folder-properties.c:143
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Mensaje en total:"
 msgstr[1] "Mensajes en total:"
 
-#: mail/em-folder-properties.c:173
+#: mail/em-folder-properties.c:155
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensaje no leído:"
 msgstr[1] "Mensajes no leídos:"
 
-#: mail/em-folder-selection-button.c:120
+#: mail/em-folder-properties.c:270 plugins/shared-folder/properties.glade.h:9
+msgid "Folder Properties"
+msgstr "Propiedades de la carpeta"
+
+#: mail/em-folder-selection-button.c:121
 msgid "<click here to select a folder>"
 msgstr "<pulse aquí para seleccionar una carpeta>"
 
@@ -13305,289 +10386,447 @@ msgstr "<pulse aquí para seleccionar una carpeta>"
 msgid "Create New Folder"
 msgstr "Crear carpeta nueva"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2433
-#: mail/mail-component.c:711
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2471
+#: mail/mail-component.c:732 plugins/shared-folder/share-folder-common.c:346
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: mail/em-folder-selector.c:300
+#: mail/em-folder-selector.c:304
 msgid "Create"
 msgstr "Crear"
 
-#: mail/em-folder-selector.c:304
+#: mail/em-folder-selector.c:308
 msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
-#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
-#: mail/mail-vfolder.c:872
-msgid "VFolders"
-msgstr "Carpetas virtuales"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
-msgid "UNMATCHED"
-msgstr "NO COINCIDENTE"
+#: mail/em-folder-tree.c:678
+msgid "Mail Folder Tree"
+msgstr "Árbol de carpetas de correo"
 
-#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
-msgid "Loading..."
-msgstr "Cargando..."
-
-#: mail/em-folder-tree.c:901
+#: mail/em-folder-tree.c:911
 #, c-format
 msgid "Moving folder %s"
-msgstr "Moviendo carpeta %s"
+msgstr "Moviendo la carpeta %s"
 
-#: mail/em-folder-tree.c:903
+#: mail/em-folder-tree.c:913
 #, c-format
 msgid "Copying folder %s"
-msgstr "Copiando carpeta %s"
+msgstr "Copiando la carpeta %s"
 
-#: mail/em-folder-tree.c:910 mail/message-list.c:1613
+#: mail/em-folder-tree.c:920 mail/message-list.c:1617
 #, c-format
 msgid "Moving messages into folder %s"
-msgstr "Moviendo mensajes a la carpeta %s"
+msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:912 mail/message-list.c:1615
+#: mail/em-folder-tree.c:922 mail/message-list.c:1619
 #, c-format
 msgid "Copying messages into folder %s"
-msgstr "Copiando mensajes a la carpeta %s"
+msgstr "Copiando los mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:928
+#: mail/em-folder-tree.c:938
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se pudo dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: mail/em-folder-tree.c:1018 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:1034 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: mail/em-folder-tree.c:1019 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:1035 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
-#: mail/em-folder-tree.c:1021 mail/em-folder-tree.c:2220
-#: mail/em-folder-view.c:803 mail/message-list.c:1703
-msgid "_Move"
-msgstr "_Mover"
-
-#: mail/em-folder-tree.c:1023 mail/message-list.c:1705
-msgid "Cancel _Drag"
-msgstr "Cancelar _arrastre"
+#: mail/em-folder-tree.c:1734 mail/mail-ops.c:1017
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Analizando carpetas en «%s»"
 
-#: mail/em-folder-tree.c:2207 mail/em-folder-tree.c:2220
-#: mail/em-folder-view.c:803 mail/em-folder-view.c:817
-#: mail/importers/evolution-mbox-importer.c:119
-#: mail/importers/evolution-outlook-importer.c:133
+#: mail/em-folder-tree.c:2241 mail/em-folder-tree.c:2255
+#: mail/em-folder-view.c:834 mail/em-folder-view.c:849
+#: mail/importers/evolution-mbox-importer.c:120
+#: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: mail/em-folder-tree.c:2207 mail/em-folder-view.c:817
+#: mail/em-folder-tree.c:2241 mail/em-folder-view.c:849
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: mail/em-folder-tree.c:2247
+#: mail/em-folder-tree.c:2282 plugins/shared-folder/share-folder-common.c:138
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta «%s»"
 
-#: mail/em-folder-tree.c:2433 mail/mail-component.c:711
+#: mail/em-folder-tree.c:2471 mail/mail-component.c:732
+#: plugins/shared-folder/share-folder-common.c:346
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: mail/em-folder-tree.c:2629
+#: mail/em-folder-tree.c:2664
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar la carpeta «%s» a:"
 
-#: mail/em-folder-tree.c:2631
+#: mail/em-folder-tree.c:2666
 msgid "Rename Folder"
 msgstr "Renombrar carpeta"
 
-#: mail/em-folder-tree.c:2706 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2669
+msgid "Folder names cannot contain '/'"
+msgstr "El nombre de la carpeta no puede contener el carácter «/»"
+
+#: mail/em-folder-tree.c:2746 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Ver"
 
-#: mail/em-folder-tree.c:2707
+#: mail/em-folder-tree.c:2747
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
-#: mail/em-folder-tree.c:2711
+#: mail/em-folder-tree.c:2751
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: mail/em-folder-tree.c:2712
+#: mail/em-folder-tree.c:2752
 msgid "_Move..."
 msgstr "_Mover..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2716
+#: mail/em-folder-tree.c:2756
 msgid "_New Folder..."
 msgstr "Carpeta _nueva..."
 
-#: mail/em-folder-tree.c:2719
+#: mail/em-folder-tree.c:2759
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: mail/em-folder-tree.c:2722 ui/evolution-mail-list.xml.h:27
-msgid "_Properties"
-msgstr "_Propiedades"
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:891
+msgid "VFolders"
+msgstr "Carpetas virtuales"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "NO COINCIDENTE"
 
-#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:900 mail/em-popup.c:690
-#: ui/evolution-mail-message.xml.h:113
+#. Inbox is always first
+#. translators: standard local mailbox names
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+#: mail/mail-component.c:138
+msgid "Inbox"
+msgstr "Bandeja de entrada"
+
+#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: mail/em-folder-view.c:437 mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:531
+#: mail/mail-component.c:582
+msgid "Mail"
+msgstr "Correo"
+
+#: mail/em-folder-view.c:939 ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/em-folder-view.c:902
+#: mail/em-folder-view.c:941
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/em-folder-view.c:905 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:944 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: mail/em-folder-view.c:906 mail/em-popup.c:811
+#: mail/em-folder-view.c:945 mail/em-popup.c:502
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: mail/em-folder-view.c:907 mail/em-popup.c:812
+#: mail/em-folder-view.c:946 mail/em-popup.c:503
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/em-folder-view.c:908 mail/em-popup.c:814
+#: mail/em-folder-view.c:947 mail/em-popup.c:505
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: mail/em-folder-view.c:911
+#: mail/em-folder-view.c:950
 msgid "Follo_w Up..."
 msgstr "Se_guimiento..."
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:951
 msgid "Fla_g Completed"
 msgstr "Ma_rcar como terminado"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:952
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:955 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: mail/em-folder-view.c:917
+#: mail/em-folder-view.c:956
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: mail/em-folder-view.c:918
+#: mail/em-folder-view.c:957
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: mail/em-folder-view.c:919
+#: mail/em-folder-view.c:958
 msgid "_Mark as Unimportant"
 msgstr "Marcar como no im_portante"
 
-#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:959 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Marcar como _spam"
 
-#: mail/em-folder-view.c:921 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:960 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _no spam"
 
-#: mail/em-folder-view.c:925
+#: mail/em-folder-view.c:964
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:928
+#: mail/em-folder-view.c:967
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver a la carpeta..."
 
-#: mail/em-folder-view.c:929 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:968 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/em-folder-view.c:937
+#: mail/em-folder-view.c:976
 msgid "Add Sender to Address_book"
 msgstr "Añadir remitente a la li_breta de direcciones"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:979
 msgid "Appl_y Filters"
 msgstr "Aplicar _filtros"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:980
 msgid "F_ilter Junk"
 msgstr "F_iltrar spam"
 
-#: mail/em-folder-view.c:944
+#: mail/em-folder-view.c:983
 msgid "Crea_te Rule From Message"
 msgstr "Crear re_gla desde el mensaje"
 
-#: mail/em-folder-view.c:945
+#: mail/em-folder-view.c:984
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual según el a_sunto"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:985
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual según el re_mitente"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:986
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual según los des_tinatarios"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:987
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual según la li_sta de correo"
 
-#: mail/em-folder-view.c:952
+#: mail/em-folder-view.c:991
 msgid "Filter on Sub_ject"
 msgstr "Filtro según el _asunto"
 
-#: mail/em-folder-view.c:953
+#: mail/em-folder-view.c:992
 msgid "Filter on Sen_der"
 msgstr "Filtro según el _remitente"
 
-#: mail/em-folder-view.c:954
+#: mail/em-folder-view.c:993
 msgid "Filter on Re_cipients"
 msgstr "Filtro según los _destinatarios"
 
-#: mail/em-folder-view.c:955
+#: mail/em-folder-view.c:994
 msgid "Filter on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1711 mail/em-folder-view.c:1751
-#: mail/mail-config.glade.h:68
+#: mail/em-folder-view.c:1771 mail/em-folder-view.c:1814
 msgid "Default"
 msgstr "Predeterminado"
 
-#: mail/em-folder-view.c:1848
+#: mail/em-folder-view.c:1911
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/em-folder-view.c:2115
+#: mail/em-folder-view.c:2190
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: mail/em-folder-view.c:2380
+#: mail/em-folder-view.c:2473
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
+#: mail/em-format.c:848 mail/em-format-html.c:1424 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:326
+msgid "From"
+msgstr "De"
+
+#: mail/em-format.c:849 mail/em-format-html.c:1424 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:84
+msgid "Reply-To"
+msgstr "Responder a"
+
+#: mail/em-format.c:850 mail/em-format-html.c:1424 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Para"
+
+#: mail/em-format.c:851 mail/em-format-html.c:1424 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:86
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format.c:852 mail/em-format-html.c:1424 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:87
+msgid "Bcc"
+msgstr "Cco"
+
+#: mail/em-format.c:854 mail/em-format-html.c:1577 mail/em-format-quote.c:322
+#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Fecha"
+
+#: mail/em-format.c:855 mail/em-format-html.c:1600 mail/em-mailer-prefs.c:90
+msgid "Newsgroups"
+msgstr "Grupos de noticias"
+
+#: mail/em-format.c:1104
 #, c-format
-msgid "Matches: %d"
-msgstr "Coincide con: %d"
+msgid "%s attachment"
+msgstr "%s adjunto"
+
+#: mail/em-format.c:1143 mail/em-format.c:1276
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "No se pudo interpretar el mensaje S/MIME: Error desconocido"
 
-#: mail/em-format-html-display.c:643 mail/em-format-html.c:582
+#: mail/em-format.c:1266
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipo de cifrado no soportado para multipart/encrypted"
+
+#: mail/em-format.c:1414
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
+
+#: mail/em-format.c:1433
+msgid "Unsupported signature format"
+msgstr "Formato de firma no soportado"
+
+#: mail/em-format.c:1441
+msgid "Error verifying signature"
+msgstr "Error al verificar la firma"
+
+#: mail/em-format.c:1441
+msgid "Unknown error verifying signature"
+msgstr "Error desconocido al verificar la firma"
+
+#: mail/em-format-html.c:472 mail/em-format-html.c:474
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Obteniendo «%s»"
+
+#: mail/em-format-html.c:579 mail/em-format-html-display.c:638
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: mail/em-format-html-display.c:643
+#: mail/em-format-html.c:580 mail/em-format-html-display.c:639
+msgid "Valid signature"
+msgstr "Firma válida"
+
+#: mail/em-format-html.c:581 mail/em-format-html-display.c:640
+msgid "Invalid signature"
+msgstr "Firma no válida"
+
+#: mail/em-format-html.c:582
+msgid "Valid signature but cannot verify sender"
+msgstr "Firma válida, pero no se puede verificar el remitente"
+
+#: mail/em-format-html.c:588 mail/em-format-html-display.c:647
+msgid "Unencrypted"
+msgstr "Descifrado"
+
+#: mail/em-format-html.c:589 mail/em-format-html-display.c:648
+msgid "Encrypted, weak"
+msgstr "Cifrado, débil"
+
+#: mail/em-format-html.c:590 mail/em-format-html-display.c:649
+msgid "Encrypted"
+msgstr "Cifrado"
+
+#: mail/em-format-html.c:591 mail/em-format-html-display.c:650
+msgid "Encrypted, strong"
+msgstr "Cifrado, fuerte"
+
+#: mail/em-format-html.c:840
+msgid "Malformed external-body part."
+msgstr "Parte externa al cuerpo del mensaje mal escrita."
+
+#: mail/em-format-html.c:870
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Puntero a sitio FTP (%s)"
+
+#: mail/em-format-html.c:881
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Puntero a archivo local (%s) valido en «%s»"
+
+#: mail/em-format-html.c:883
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Puntero a archivo local (%s)"
+
+#: mail/em-format-html.c:904
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Puntero a sitio FTP (%s)"
+
+#: mail/em-format-html.c:915
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formateando el mensaje"
+
+#. pseudo-header
+#: mail/em-format-html.c:1537 mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:984
+msgid "Mailer"
+msgstr "Transporte"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1564
+msgid "<I> (%a, %R %Z)</I>"
+msgstr "<I> (%a, %R %Z)</I>"
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1567
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#. message-search popup match count string
+#: mail/em-format-html-display.c:405
+#, c-format
+msgid "Matches: %d"
+msgstr "Coincide con: %d"
+
+#: mail/em-format-html-display.c:638
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13595,11 +10834,7 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: mail/em-format-html-display.c:644 mail/em-format-html.c:583
-msgid "Valid signature"
-msgstr "Firma válida"
-
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:639
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13607,11 +10842,7 @@ msgstr ""
 "Este mensaje está firmado y es válido, lo que significa que es muy probable "
 "que el mensaje sea auténtico."
 
-#: mail/em-format-html-display.c:645 mail/em-format-html.c:584
-msgid "Invalid signature"
-msgstr "Firma no válida"
-
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13619,11 +10850,11 @@ msgstr ""
 "La firma de este mensaje no puede ser verificada, pudo haber sido alterada "
 "en tránsito."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:641
 msgid "Valid signature, cannot verify sender"
 msgstr "Firma válida, no se puede verificar el remitente"
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13631,11 +10862,7 @@ msgstr ""
 "Este mensaje está firmado con una firma válida, pero el remitente del "
 "mensaje no pudo ser verificado."
 
-#: mail/em-format-html-display.c:652 mail/em-format-html.c:591
-msgid "Unencrypted"
-msgstr "Descifrado"
-
-#: mail/em-format-html-display.c:652
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -13643,11 +10870,7 @@ msgstr ""
 "Este mensaje no está cifrado. Su contenido puede ser visto en tránsito a "
 "través de Internet."
 
-#: mail/em-format-html-display.c:653 mail/em-format-html.c:592
-msgid "Encrypted, weak"
-msgstr "Cifrado, débil"
-
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:648
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -13657,11 +10880,7 @@ msgstr ""
 "ser difícil, pero no imposible para un espía ver el contenido de este "
 "mensaje empleando algo de tiempo."
 
-#: mail/em-format-html-display.c:654 mail/em-format-html.c:593
-msgid "Encrypted"
-msgstr "Cifrado"
-
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13669,11 +10888,7 @@ msgstr ""
 "Este mensaje está cifrado. Sería difícil para un espía ver el contenido de "
 "este mensaje."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:594
-msgid "Encrypted, strong"
-msgstr "Cifrado, fuerte"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -13683,178 +10898,60 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: mail/em-format-html-display.c:756 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:751 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: mail/em-format-html-display.c:771
+#: mail/em-format-html-display.c:766
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: mail/em-format-html-display.c:1006
+#: mail/em-format-html-display.c:995
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado el %d de %B de %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1014
+#: mail/em-format-html-display.c:1003
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: mail/em-format-html-display.c:1017
+#: mail/em-format-html-display.c:1006
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes del %d de %B de %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1056
+#: mail/em-format-html-display.c:1053
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_Hide"
 msgstr "_Ocultar"
 
+#: mail/em-format-html-display.c:1298
+msgid "Attachment Button"
+msgstr "Botón de adjunto"
+
 #: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: mail/em-format-html.c:475 mail/em-format-html.c:477
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Obteniendo «%s»"
-
-#: mail/em-format-html.c:585
-msgid "Valid signature but cannot verify sender"
-msgstr "Firma válida, pero no se puede verificar el remitente"
-
-#: mail/em-format-html.c:848
-msgid "Malformed external-body part."
-msgstr "Parte externa al cuerpo del mensaje mal escrita."
-
-#: mail/em-format-html.c:878
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Puntero a sitio FTP (%s)"
-
-#: mail/em-format-html.c:889
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Puntero a archivo local (%s) valido en «%s»"
-
-#: mail/em-format-html.c:891
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Puntero a archivo local (%s)"
-
-#: mail/em-format-html.c:912
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Puntero a sitio FTP (%s)"
-
-#: mail/em-format-html.c:923
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
-
-#: mail/em-format-html.c:1165
-msgid "Formatting message"
-msgstr "Formateando el mensaje"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:800
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "De"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:801
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Responder a"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:802
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Para"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:803
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:804
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Cco"
-
-#. pseudo-header
-#: mail/em-format-html.c:1554 mail/em-format-quote.c:314
-#: mail/em-mailer-prefs.c:939
-msgid "Mailer"
-msgstr "Transporte"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1581
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1584
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1594 mail/em-format-quote.c:321 mail/em-format.c:806
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Fecha"
-
-#: mail/em-format-html.c:1617 mail/em-format.c:807 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Grupos de noticias"
-
-#: mail/em-format.c:1056
-#, c-format
-msgid "%s attachment"
-msgstr "%s adjunto"
-
-#: mail/em-format.c:1095 mail/em-format.c:1228
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "No se pudo interpretar el mensaje S/MIME: Error desconocido"
-
-#: mail/em-format.c:1218
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tipo de cifrado no soportado para multipart/encrypted"
-
-#: mail/em-format.c:1379
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
-
-#: mail/em-format.c:1398
-msgid "Unsupported signature format"
-msgstr "Formato de firma no soportado"
-
-#: mail/em-format.c:1406
-msgid "Error verifying signature"
-msgstr "Error al verificar la firma"
-
-#: mail/em-format.c:1406
-msgid "Unknown error verifying signature"
-msgstr "Error desconocido al verificar la firma"
-
-#: mail/em-junk-filter.c:86
+#: mail/em-junk-filter.c:110
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrado)"
 
-#: mail/em-mailer-prefs.c:100
+#: mail/em-mailer-prefs.c:101
 msgid "Every time"
 msgstr "Cada vez"
 
-#: mail/em-mailer-prefs.c:101
+#: mail/em-mailer-prefs.c:102
 msgid "Once per day"
 msgstr "Una vez por día"
 
-#: mail/em-mailer-prefs.c:102
+#: mail/em-mailer-prefs.c:103
 msgid "Once per week"
 msgstr "Una vez por semana"
 
-#: mail/em-mailer-prefs.c:103
+#: mail/em-mailer-prefs.c:104
 msgid "Once per month"
 msgstr "Una vez por mes"
 
@@ -13900,17 +10997,17 @@ msgstr "Fallo al crear directorio de datos POP3 keep-on-server  «%s»: %s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "No se pudo copiar los datos POP3 keep-on-server «%s»: %s"
 
-#: mail/em-migrate.c:2415 mail/em-migrate.c:2427
+#: mail/em-migrate.c:2494 mail/em-migrate.c:2506
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Fallo al crear almacén de correo local  «%s»: %s"
 
-#: mail/em-migrate.c:2578
+#: mail/em-migrate.c:2657
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "No se pudo crear las carpetas de correo local en: «%s»: %s"
 
-#: mail/em-migrate.c:2596
+#: mail/em-migrate.c:2675
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13918,62 +11015,62 @@ msgstr ""
 "No se pudo leer la configuración de la instalación anterior de Evolution, "
 "«evolution/config.xmldb» no existe o está corrompido."
 
-#: mail/em-popup.c:700
+#: mail/em-popup.c:386
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: mail/em-popup.c:718
+#: mail/em-popup.c:405
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagen_sin_título.%s"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:499
 msgid "Set as _Background"
 msgstr "Establecer como _fondo"
 
-#: mail/em-popup.c:810
+#: mail/em-popup.c:501
 msgid "_Reply to sender"
 msgstr "_Responder al remitente"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:553
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:554
 msgid "Se_nd message to..."
 msgstr "E_nviar un mensaje a..."
 
-#: mail/em-popup.c:861
+#: mail/em-popup.c:555
 msgid "_Add to Addressbook"
 msgstr "_Añadir a la libreta de direcciones"
 
-#: mail/em-popup.c:985
+#: mail/em-popup.c:686
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:613
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacén no soporta suscripciones, o no están activadas."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:642
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#: mail/em-subscribe-editor.c:639
+#: mail/em-subscribe-editor.c:646
 msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:852
+#: mail/em-subscribe-editor.c:861
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: mail/em-subscribe-editor.c:873
+#: mail/em-subscribe-editor.c:882
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
-#: mail/em-utils.c:104
+#: mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
@@ -13994,7 +11091,7 @@ msgid "Add address"
 msgstr "Añadir dirección"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1053
+#: mail/em-utils.c:1055
 #, c-format
 msgid "Messages from %s"
 msgstr "Correos de %s"
@@ -14003,10 +11100,6 @@ msgstr "Correos de %s"
 msgid "Virtual _Folders"
 msgstr "Carpetas _virtuales"
 
-#: mail/em-vfolder-rule.c:494
-msgid "_Add"
-msgstr "_Añadir"
-
 #: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "Origen de la carpeta virtual"
@@ -14119,6 +11212,12 @@ msgstr "Altura del panel de vista de mensajes."
 
 #: mail/evolution-mail.schemas.in.in.h:27
 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.in.h:28
+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."
@@ -14128,23 +11227,23 @@ msgstr ""
 "visor de componentes bonobo en la base de datos de Gnome puede usarse para "
 "mostrar el contenido."
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Última vez que se vació la papelera"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -14153,11 +11252,11 @@ msgstr ""
 "lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
 "mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
 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.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 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."
@@ -14166,19 +11265,19 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista de tipos mime de comprobación de visores de componentes bonobo"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:37
 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.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imágenes para mensajes HTML sobre http"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
@@ -14188,185 +11287,179 @@ msgstr ""
 "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.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto después del tiempo especificado"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto después del tiempo especificado."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuales en la vista preliminar del mensaje"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la vista preliminar del mensaje."
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Altura predeterminada de la ventana de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Anchura predeterminada de la ventana de mensaje"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Estilo del mensaje (normal, cabeceras completas, fuente)"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:51
 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.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:52
 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.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Archivo de sonido de notificación de correo nuevo"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Tipo de notificación de correo nuevo"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto está en blanco"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intenta compactar una carpeta."
 
-#: mail/evolution-mail.schemas.in.in.h:56
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: mail/evolution-mail.schemas.in.in.h:57
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intenta enviar un mensaje sin un asunto."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacta"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sólo rellena el campo Cco"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:60
+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.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar al mandar mensajes en HTML a contactos que no los quieren."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cuando el usuario intente enviar un mensaje sin destinatarios Para "
 "o Cc."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intenta enviar HTML no deseado"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Reconocer emoticonos en el texto y reemplazarlos con imágenes."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Ejecutar la prueba de spam en el correo entrante"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisión"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por omisión."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Mostrar imágenes animadas como animaciones."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar mensajes borrados (tachados) en la lista de mensajes."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar mensajes borrados en la lista de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:71
-msgid "Show the \"Preview\" pane"
-msgstr "Mostrar el panel de vista previa"
-
-#: mail/evolution-mail.schemas.in.in.h:72
-msgid "Show the \"Preview\" pane."
-msgstr "Mostrar el panel de vista previa."
-
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Reproducir un archivo de sonido cuando llegue correo nuevo."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr ""
-"Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
+msgstr "Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en línea"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada del diálogo de suscripción"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Anchura predeterminada del diálogo de suscripción"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Tipografía del terminal"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "La última vez que se vació la papelera, en días desde la época."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "La tipografía de terminal para mostrar el correo"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "La letra de anchura variable para mostrar el correo"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 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;"
@@ -14378,99 +11471,99 @@ msgstr ""
 "estructura XML es &lt;header enabled&gt; - establece activado si la cabecera "
 "se debe mostrar en la vista de correo."
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Lista de mensajes por conversaciones."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Lista de mensajes por conversaciones"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Conversaciones basadas en el asunto"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Temporización para marcar un mensaje como visto"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Temporización para marcar un mensaje como visto."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamasssassin daemon and client"
 msgstr "Usar el demonio y cliente de Spamassassin"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Usar el demonio y cliente de Spamassassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Usar tipografía personalizada"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Usar tipografía personalizada para mostrar el correo"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Usar sólo los tests de spam local."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usar sólo los tests de spam local (sin DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Tipografía de anchura variable"
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "El elemento del menú «Ver/Cco» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "El elemento del menú «Ver/Cco» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "El elemento del menú «Ver/Cc» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "El elemento del menú «Ver/Cc» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "El elemento del menú «Ver/Desde» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "El elemento del menú «Ver/Desde» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "El elemento del menú «Ver/Publicar en» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "El elemento del menú «Ver/Publicar en» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "El elemento del menú «Ver/Responder a» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:105
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "El elemento del menú «Ver/Responder a» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:106
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -14478,56 +11571,82 @@ msgstr ""
 "Indica si se debe o no volver al hilado de conversaciones por asuntos cuando "
 "los mensajes no contienen cabeceras In-Reply-To o References."
 
-#: mail/evolution-mail.schemas.in.in.h:107
+#: mail/evolution-mail.schemas.in.in.h:109
 msgid "port for starting user runned spamd"
 msgstr "puerto para iniciar el spamd ejecutado por el usuario"
 
-#: mail/evolution-mail.schemas.in.in.h:108
+#: mail/evolution-mail.schemas.in.in.h:110
 msgid "spamd port"
 msgstr "puerto spamd"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Importador de Elm de Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Preferencias del editor"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Importador de correo de Netscape de Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure las preferencias de correo incluyendo seguridad y visualización de "
+"mensajes, aquí"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Importador de Evolution para Outlook Express 4"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure la ortografía, firmas y el editor de mensajes aquí"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Importador de Pine de Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Configure sus cuentas de correo aquí"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Importador de mbox de Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Correo de Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Control de configuración de cuentas de correo de Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Componente de correo de Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Redactor de correo de Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Control de configuración del redactor de correo de Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail preferences control"
+msgstr "Control de preferencias de Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Mail Accounts"
+msgstr "Cuentas de correo"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Opciones de correo"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "Co_rreo"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution está importando su correo antiguo de Elm"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:224
-#: mail/importers/evolution-outlook-importer.c:258
+#: mail/importers/evolution-mbox-importer.c:225
+#: mail/importers/evolution-outlook-importer.c:259
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importando..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:226
-#: mail/importers/evolution-outlook-importer.c:260
+#: mail/importers/evolution-mbox-importer.c:227
+#: mail/importers/evolution-outlook-importer.c:261
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Por favor espere"
@@ -14548,29 +11667,57 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:116
-#: mail/importers/evolution-outlook-importer.c:130
+#: mail/importers/evolution-mbox-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
 msgstr "Carpeta de destino:"
 
-#: mail/importers/evolution-mbox-importer.c:119
-#: mail/importers/evolution-outlook-importer.c:133
+#: mail/importers/evolution-mbox-importer.c:120
+#: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
 msgstr "Seleccione la carpeta en la que importar"
 
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:256
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando «%s»"
 
-#: mail/importers/evolution-outlook-importer.c:304
+#: mail/importers/evolution-outlook-importer.c:305
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importando buzón de correo"
 
-#: mail/importers/mail-importer.c:361
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Importador de Elm de Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Importador de correo de Netscape de Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Importador de Evolution para Outlook Express 4"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Importador de Pine de Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Importador de mbox de Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizando %s"
@@ -14664,10 +11811,6 @@ msgstr "Evolution está importando su información antigua de Pine"
 msgid "Importing Pine data"
 msgstr "Importando datos de Pine"
 
-#: mail/importers/pine-importer.c:479
-msgid "Addressbook"
-msgstr "Libreta de direcciones"
-
 #: mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
@@ -14680,41 +11823,6 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
-msgid "Evolution Account Editor"
-msgstr "Editor de cuentas de Evolution"
-
-#: mail/mail-account-gui.c:246
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"Por favor, lea cuidadosamente el acuerdo de licencia\n"
-"para %s mostrado abajo\n"
-"y marque la casilla para aceptarlo.\n"
-
-#: mail/mail-account-gui.c:252
-#, c-format
-msgid "%s License Agreement"
-msgstr "Acuerdo de Licencia %s"
-
-#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
-msgid "_Host:"
-msgstr "_Servidor:"
-
-#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
-msgid "User_name:"
-msgstr "_Usuario:"
-
-#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
-msgid "_Path:"
-msgstr "R_uta:"
-
 #: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
@@ -14739,154 +11847,95 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:139
+msgid "Drafts"
+msgstr "Borradores"
+
+#: mail/mail-component.c:140
+msgid "Outbox"
+msgstr "Bandeja de salida"
+
+#: mail/mail-component.c:141
+msgid "Sent"
+msgstr "Correo enviado"
+
+#: mail/mail-component.c:484
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borrado"
 msgstr[1] "%d borrados"
 
-#: mail/mail-component.c:465
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d spam"
 msgstr[1] "%d spams"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:509
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:511
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:513
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sin enviar"
 msgstr[1] "%d sin enviar"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:517
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:519
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d no leído"
 msgstr[1] ", %d no leídos"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:684
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:685
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:686
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: mail/mail-component.c:671
+#: mail/mail-component.c:692
 msgid "New Mail Folder"
 msgstr "Nueva carpeta de correo"
 
-#: mail/mail-component.c:672
+#: mail/mail-component.c:693
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: mail/mail-component.c:673
+#: mail/mail-component.c:694
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: mail/mail-component.c:805
+#: mail/mail-component.c:841
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Fallo al actualizar la configuración de correo o carpetas."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
-msgid "Identity"
-msgstr "Identidad"
-
-#: mail/mail-config-druid.c:364
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Por favor escriba debajo su nombre y dirección de correo-e. Los campos "
-"«opcionales» no hace falta que los rellene, a menos que quiera incluir esta "
-"información en el correo-e que envíe."
-
-#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:119
-msgid "Receiving Mail"
-msgstr "Recepción de correo"
-
-#: mail/mail-config-druid.c:372
-msgid ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Por favor rellene la información acerca del servidor de correo de entrada. "
-"Si no está seguro, pregúntele a su administrador de sistemas o a su "
-"Proveedor de Servicios de Internet."
-
-#: mail/mail-config-druid.c:379
-msgid "Please select among the following options"
-msgstr "Por favor selecciona entre las siguientes opciones"
-
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
-msgid "Sending Mail"
-msgstr "Envío de correo"
-
-#: mail/mail-config-druid.c:384
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Por favor escriba debajo la información acerca de cómo enviará su correo. Si "
-"no está seguro, pregúntele a su administrador de sistemas o a su Proveedor "
-"de Servicios de Internet."
-
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
-msgid "Account Management"
-msgstr "Gestión de la cuenta"
-
-#: mail/mail-config-druid.c:391
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-"Casi ha acabado con el proceso de configuración del correo. La identidad, el "
-"servidor de correo de entrada y el método de envío de correo que ha "
-"especificado serán agrupados para crear una cuenta de correo de Evolution. "
-"Por favor escriba un nombre para esta cuenta en el espacio de abajo. Este "
-"nombre sólo se usará para mostrar información."
-
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Comprobando el servicio"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Conectando al servidor..."
-
 #: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
@@ -14896,7 +11945,7 @@ msgid " Ch_eck for Supported Types "
 msgstr "_Comprobar tipos soportados "
 
 #: mail/mail-config.glade.h:5
-msgid "<b>SSL is not supported in this build of evolution</b>"
+msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL no está soportado en esta compilación de Evolution</b>"
 
 #: mail/mail-config.glade.h:6
@@ -14909,8 +11958,7 @@ msgstr "<b>_Idiomas</b>"
 
 #: mail/mail-config.glade.h:8
 msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr ""
-"<small>Esto hará que el filtrado sea más exacto, pero más lento</small>"
+msgstr "<small>Esto hará que el filtrado sea más exacto, pero más lento</small>"
 
 #: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
@@ -14929,190 +11977,190 @@ msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autenticación</span>"
 
 #: mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Checking for New Mail</span>"
-msgstr "<span weight=\"bold\">Comprobación de correo nuevo</span>"
-
-#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Redacción de mensajes</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuración</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Comportamiento predeterminado</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Borrar correo</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Cabeceras de correo _mostradas</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Opciones de filtros</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19 plugins/itip-formatter/itip-formatter.c:1641
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiquetas y colores</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Cargando imágenes</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Mensaje a mostrar</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Tipografías del mensaje</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Notificación de correo nuevo</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Información opcional</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opciones</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Tipografía para impresión</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Información requerida</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME seguro (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Seguridad</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Mensajes enviados y borradores</span>"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuración del servidor</span>"
 
 #: mail/mail-config.glade.h:35
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "_También cifrar a mí mismo cuando envíe correo cifrado"
+msgid "Account Management"
+msgstr "Gestión de la cuenta"
 
 #: mail/mail-config.glade.h:36
-msgid "Account Editor"
-msgstr "Editor de cuentas"
-
-#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Añadir firma _nueva..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Añadir sc_ript"
 
-#: mail/mail-config.glade.h:40
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "S_iempre cifrarme a mí mismo cuando envíe correo cifrado"
+#: mail/mail-config.glade.h:38
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "Firmar _siempre el correo saliente cuando se use esta cuenta"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:39
+msgid "Also encrypt to sel_f when sending encrypted mail"
+msgstr "También cifrar a _mí mismo cuando envíe correo cifrado"
+
+#: mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Siempre mandar _copia de carbón (Cc) a:"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Siempre mandar copia de carbón oc_ulta (Cco) a:"
+msgstr "Siempre mandar copia de carbón _oculta (Cco) a:"
 
-#: mail/mail-config.glade.h:44
-msgid "Always _sign outgoing messages when using this account"
-msgstr "_Firmar siempre el correo saliente al usar esta cuenta"
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Siempre _confiar en las claves de mi anillo cuando cifre"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
+msgid "Always encrypt to _myself when sending encrypted mail"
+msgstr "Siempre cifrarme a _mí mismo cuando envíe correo cifrado"
+
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Adjuntar mensaje original"
 
-#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:46
 msgid "Automatically _insert smiley images"
 msgstr "_Insertar emoticonos automáticamente"
 
-#: mail/mail-config.glade.h:49
-msgid "Automatically check for _new mail every"
-msgstr "_Comprobar si hay correo nuevo automáticamente cada"
-
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "Emitir un _pitido cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Conjunto de carac_teres:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Comprobar tipos soportados "
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 msgid "Check _incoming mail for junk"
 msgstr "Comprobar si el correo entrante es _spam"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Comprobar orto_grafía mientras se escribe"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Comprueba si el correo entrante es spam"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
+msgid "Cle_ar"
+msgstr "_Vaciar"
+
+#: mail/mail-config.glade.h:56
+msgid "Clea_r"
+msgstr "_Vaciar"
+
+#: mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras _mal escritas:"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Colores"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "_Confirmar antes de compactar una carpeta"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15128,243 +12176,257 @@ msgstr ""
 "\n"
 "Pulse «Finalizar» para guardar su configuración."
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Predeterminada"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "_Codificación de caracteres predeterminada:"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Predeterminados"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
+msgid "Digitally _sign outgoing messages (by default)"
+msgstr "Firmar _digitalmente los mensajes salientes (por omisión)"
+
+#: mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "No citar el mensaje original"
 
-#: mail/mail-config.glade.h:73
-msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr ""
-"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
-
-#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:72 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Carpeta de _borradores:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Cuentas de correo"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "Dir_ección de correo:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Vaciar _papelera al salir"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Certificado de _cifrado:"
 
-#: mail/mail-config.glade.h:81
-msgid "Evolution Account Assistant"
-msgstr "Asistente de cuentas de Evolution"
+#: mail/mail-config.glade.h:79
+msgid "Encrypt out_going messages (by default)"
+msgstr "_Cifrar mensajes salientes (por omisión)"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "A_nchura fija:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Propiedades de tipografías"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Dar formato _HTML a los mensajes"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "Correo en HTML"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "Cabeceras"
 
 # Esta cadena debe permanecer así
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
 msgstr "_Resaltar texto citado con este color:"
 
-#: mail/mail-config.glade.h:90
-msgid "IMAPv4 "
-msgstr "IMAPv4 "
-
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "I_nclude remote tests"
 msgstr "I_ncluir tests remotos"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:90
+msgid "Identity"
+msgstr "Identidad"
+
+#: mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "Incluido en línea"
 
-#: mail/mail-config.glade.h:96
-msgid "Kerberos "
-msgstr "Kerberos "
-
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Localización del Mailbox"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Editor de mensajes"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:99
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Nota: No se le pedirá una contraseña hasta que conecte por primera vez"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:100
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:101
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:104
 msgid "Play sound file when new mail arri_ves"
 msgstr "Reproducir un archivo de _sonido cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:105
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Por favor escriba debajo la información acerca de cómo enviará su correo. Si "
+"no está seguro, pregúntele a su administrador de sistemas o a su Proveedor "
+"de Servicios de Internet."
+
+#: mail/mail-config.glade.h:106
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Por favor escriba debajo su nombre y dirección de correo-e. Los campos "
+"«opcionales» no hace falta que los rellene, a menos que quiera incluir esta "
+"información en el correo-e que envíe."
+
+#: mail/mail-config.glade.h:107
+msgid "Please select among the following options"
+msgstr "Por favor selecciona entre las siguientes opciones"
+
+#: mail/mail-config.glade.h:108
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preguntar al mandar mensajes que tan sólo tengan definido el _Cco"
 
-#: mail/mail-config.glade.h:113
-msgid "Qmail maildir "
-msgstr "Maildir estilo Qmail"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:109
 msgid "Quote original message"
 msgstr "Citar el mensaje original"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:110
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:111
 msgid "Re_member password"
 msgstr "_Recordar contraseña"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:112
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:113
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:120
-msgid "Receiving Options"
-msgstr "Opciones de recepción"
-
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:114
 msgid "Remember _password"
 msgstr "Recordar _contraseña"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:115
+msgid "S_elect..."
+msgstr "_Seleccione..."
+
+#: mail/mail-config.glade.h:116
 msgid "S_tandard Font:"
 msgstr "Tipografía _estándar:"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:117
+msgid "Se_lect..."
+msgstr "_Seleccione..."
+
+#: mail/mail-config.glade.h:118
 msgid "Security"
 msgstr "Seguridad"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:119
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:120
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:121
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:122
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: mail/mail-config.glade.h:129
-msgid "Select..."
-msgstr "Seleccione..."
-
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:123
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:124
+msgid "Sending Mail"
+msgstr "Envío de correo"
+
+#: mail/mail-config.glade.h:125
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:126
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:127
 msgid "Server _Type: "
 msgstr "_Tipo de servidor: "
 
-#: mail/mail-config.glade.h:136
-msgid "Si_gning certificate:"
+#: mail/mail-config.glade.h:128
+msgid "Sig_ning certificate:"
 msgstr "Certificado de _firma:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:129
 msgid "Signat_ure:"
 msgstr "_Firma:"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:130
 msgid "Signatures"
 msgstr "Firmas"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:131
 msgid "Specify _filename:"
 msgstr "Especificar nombre de a_rchivo:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:132
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: mail/mail-config.glade.h:141
-msgid "Standard Unix mbox"
-msgstr "Mailbox estándar de Unix"
-
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:133
 msgid "T_erminal Font:"
 msgstr "Tipografía del _terminal:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:134
 msgid "T_ype: "
 msgstr "_Tipo: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:135
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15374,7 +12436,7 @@ msgstr ""
 "firma. El nombre que especifique se usará\n"
 "únicamente para mostrarlo por pantalla. "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:138
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15384,7 +12446,7 @@ msgstr ""
 "y el idioma. La lista de idiomas de abajo refleja únicamente los idiomas "
 "para los cuales hay instalado un diccionario."
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:140
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15392,11 +12454,15 @@ msgstr ""
 " Teclee el nombre por el que quiere identificar a esta cuenta.\n"
 " Por ejemplo: «Trabajo» o «Personal»"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:142
+msgid "User_name:"
+msgstr "_Usuario:"
+
+#: mail/mail-config.glade.h:143
 msgid "V_ariable-width:"
 msgstr "An_chura variable:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:144
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15406,84 +12472,102 @@ msgstr ""
 "\n"
 "Pulse «Adelante» para comenzar. "
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:148
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"Casi ha acabado con el proceso de configuración del correo. La identidad, el "
+"servidor de correo de entrada y el método de envío de correo que ha "
+"especificado serán agrupados para crear una cuenta de correo de Evolution. "
+"Por favor escriba un nombre para esta cuenta en el espacio de abajo. Este "
+"nombre sólo se usará para mostrar información."
+
+#: mail/mail-config.glade.h:149
 msgid "_Add Signature"
 msgstr "_Añadir firma"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:150
 msgid "_Always load images from the Internet"
 msgstr "_Siempre cargar las imágenes desde Internet"
 
-#: mail/mail-config.glade.h:160
-msgid "_Digitally sign outgoing messages (by default)"
-msgstr "Firmar _digitalmente los mensajes salientes (por omisión)"
-
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "_No notificarme cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:163
-msgid "_Enable"
-msgstr "_Habilitar"
+#: mail/mail-config.glade.h:152
+msgid "_Don't sign meeting requests (for Outlook compatibility)"
+msgstr "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
-#: mail/mail-config.glade.h:164
-msgid "_Encrypt outgoing messages (by default)"
-msgstr "_Cifrar mensajes salientes (por omisión)"
+#: mail/mail-config.glade.h:154
+msgid "_Enable"
+msgstr "_Activar"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:157
+msgid "_Host:"
+msgstr "_Servidor:"
+
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Cargar imágenes si el remitente está en la libreta de direcciones"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "_Hacer que ésta sea mi cuenta predeterminada"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leídos tras"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:162
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar imágenes desde Internet"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:163
+msgid "_Path:"
+msgstr "R_uta:"
+
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Preguntar al mandar mensajes en HTML a contactos que no los quieren"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al mandar mensajes con el asunto vacío"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:166
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:167
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:168
 msgid "_Show animated images"
 msgstr "Mo_strar imágenes animadas"
 
-#: mail/mail-config.glade.h:179
-msgid "_Use Secure Connection (SSL):"
-msgstr "U_sar conexión segura (SSL):"
+#: mail/mail-config.glade.h:169
+msgid "_Use Secure Connection:"
+msgstr "_Usar conexión segura:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:170
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
 # Esta traducción debe mantenerse así
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:171
 msgid "color"
 msgstr " "
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "descripción"
 
@@ -15510,51 +12594,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Cifrado</span>"
 
 #: mail/mail-dialogs.glade.h:10
-msgid "Accept License"
-msgstr "Aceptar licencia"
+msgid "Case _Sensitive"
+msgstr "_Discriminar según capitalización"
 
 #: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "Terminad_o"
+msgid "Co_mpleted"
+msgstr "_Terminado"
 
-#: mail/mail-dialogs.glade.h:12
-msgid "Case Sensitive"
-msgstr "Sensible a mayúsculas"
+#: mail/mail-dialogs.glade.h:13
+msgid "F_ind:"
+msgstr "_Buscar:"
 
 #: mail/mail-dialogs.glade.h:14
 msgid "Find in Message"
 msgstr "Buscar en mensaje"
 
-#: mail/mail-dialogs.glade.h:15
-msgid "Find:"
-msgstr "Buscar:"
-
-#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/mail-dialogs.glade.h:15 mail/message-tag-followup.c:295
 #: mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Marcar para seguimiento"
 
-#: mail/mail-dialogs.glade.h:17
+#: mail/mail-dialogs.glade.h:16
 msgid "Folder Subscriptions"
 msgstr "Suscripciones de carpetas"
 
-#: mail/mail-dialogs.glade.h:18
+#: mail/mail-dialogs.glade.h:17
 msgid "License Agreement"
 msgstr "Acuerdo de licencia"
 
-#: mail/mail-dialogs.glade.h:19
+#: mail/mail-dialogs.glade.h:18
 msgid "None Selected"
 msgstr "Ninguno seleccionado"
 
-#: mail/mail-dialogs.glade.h:20
+#: mail/mail-dialogs.glade.h:19
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: mail/mail-dialogs.glade.h:21
+#: mail/mail-dialogs.glade.h:20
 msgid "Security Information"
 msgstr "Información de seguridad"
 
-#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+#: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15562,22 +12642,26 @@ msgstr ""
 "Los mensajes que ha seleccionado para seguir se listan abajo.\n"
 "Por favor, seleccione una acción de seguimiento desde el menú «Marcar»."
 
-#: mail/mail-dialogs.glade.h:25
-msgid "Tick this to accept the license agreement"
-msgstr "Marque esto para aceptar el acuerdo de licencia"
+#: mail/mail-dialogs.glade.h:24
+msgid "_Accept License"
+msgstr "_Aceptar licencia"
 
-#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#: mail/mail-dialogs.glade.h:25 mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Vence el:"
 
-#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Marcar:"
 
-#: mail/mail-dialogs.glade.h:28
+#: mail/mail-dialogs.glade.h:27
 msgid "_Subscribe"
 msgstr "_Suscribir"
 
+#: mail/mail-dialogs.glade.h:28
+msgid "_Tick this to accept the license agreement"
+msgstr "_Marque esto para aceptar el acuerdo de licencia"
+
 #: mail/mail-dialogs.glade.h:29
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
@@ -15645,11 +12729,6 @@ msgstr ""
 "{0}\n"
 "¿Enviar de todas formas?"
 
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
-msgid "_Send"
-msgstr "_Enviar"
-
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
@@ -15702,10 +12781,8 @@ msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
-"El mensaje no puede ser enviado porque no ha especificado ningún destinatario"
+msgid "This message cannot be sent because you have not specified any Recipients"
+msgstr "El mensaje no puede ser enviado porque no ha especificado ningún destinatario"
 
 #. mail:send-no-recipients secondary
 #: mail/mail-errors.xml.h:36
@@ -15767,13 +12844,27 @@ msgstr ""
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
-#. mail:exit-unsaved primary
+#. mail:ask-open-many primary
 #: mail/mail-errors.xml.h:53
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr "¿Seguro que quiere abrir {0} mensajes a la vez?"
+
+#. mail:ask-open-many secondary
+#: mail/mail-errors.xml.h:55
+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-errors.xml.h:56
+msgid "_Open Messages"
+msgstr "_Abrir mensajes"
+
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:58
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
 #. mail:exit-unsaved secondary
-#: mail/mail-errors.xml.h:55
+#: mail/mail-errors.xml.h:60
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15782,12 +12873,12 @@ msgstr ""
 "de nuevo."
 
 #. mail:camel-exception primary
-#: mail/mail-errors.xml.h:57
+#: mail/mail-errors.xml.h:62
 msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Su mensaje, con el asunto «{0}» no fue entregado."
 
 #. mail:camel-exception secondary
-#: mail/mail-errors.xml.h:59
+#: mail/mail-errors.xml.h:64
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
 "reports the following error: status 67: mail not sent.\n"
@@ -15800,81 +12891,81 @@ msgstr ""
 "tiene errores y reenvíe."
 
 #. mail:async-error primary
-#: mail/mail-errors.xml.h:62
+#: mail/mail-errors.xml.h:67
 msgid "Error while {0}."
 msgstr "Error mientras «{0}»."
 
 #. mail:async-error secondary
-#: mail/mail-errors.xml.h:64
+#: mail/mail-errors.xml.h:69
 msgid "{1}."
 msgstr "{1}."
 
 #. mail:async-error-nodescribe primary
-#: mail/mail-errors.xml.h:66
+#: mail/mail-errors.xml.h:71
 msgid "Error while performing operation."
 msgstr "Error al efectuar operación."
 
 #. mail:async-error-nodescribe secondary
-#: mail/mail-errors.xml.h:68
+#: mail/mail-errors.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
 #. mail:ask-session-password primary
-#: mail/mail-errors.xml.h:82
+#: mail/mail-errors.xml.h:87
 msgid "Enter password."
 msgstr "Introduzca la contraseña."
 
 #. mail:filter-load-error primary
-#: mail/mail-errors.xml.h:86
+#: mail/mail-errors.xml.h:91
 msgid "Error loading filter definitions."
 msgstr "Error al cargar las definiciones de filtros."
 
 #. mail:no-save-path primary
-#: mail/mail-errors.xml.h:90
+#: mail/mail-errors.xml.h:95
 msgid "Cannot save to directory \"{0}\"."
 msgstr "No se pudo guardar al directorio «{0}»."
 
 #. mail:no-create-path primary
 #. mail:no-write-path-exists primary
 #. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
-#: mail/mail-errors.xml.h:106
+#: mail/mail-errors.xml.h:99 mail/mail-errors.xml.h:107
+#: mail/mail-errors.xml.h:111
 msgid "Cannot save to file \"{0}\"."
 msgstr "No se pudo guardar al archivo «{0}»."
 
 #. mail:no-create-path secondary
-#: mail/mail-errors.xml.h:96
+#: mail/mail-errors.xml.h:101
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "No se pudo crear el directorio de guardado, debido a «{1}»"
 
 #. mail:no-create-tmp-path primary
-#: mail/mail-errors.xml.h:98
+#: mail/mail-errors.xml.h:103
 msgid "Cannot create temporary save directory."
 msgstr "No se pudo crear el directorio de guardado temporal."
 
 #. mail:no-write-path-exists secondary
-#: mail/mail-errors.xml.h:104
+#: mail/mail-errors.xml.h:109
 msgid "File exists but cannot overwrite it."
 msgstr "El archivo existe pero no se puede sobreescribir."
 
 #. mail:no-write-path-notfile secondary
-#: mail/mail-errors.xml.h:108
+#: mail/mail-errors.xml.h:113
 msgid "File exists but is not a regular file."
 msgstr "El archivo existe pero no es un archivo regular."
 
 #. mail:no-delete-folder primary
-#: mail/mail-errors.xml.h:110
+#: mail/mail-errors.xml.h:115
 msgid "Cannot delete folder \"{0}\"."
 msgstr "No se puede borrar la carpeta «{0}»."
 
-#. mail:no-delete-spethal-folder primary
-#: mail/mail-errors.xml.h:114
+#. mail:no-delete-special-folder primary
+#: mail/mail-errors.xml.h:119
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "No se pudo borrar la carpeta de sistema «{0}»."
 
-#. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
-#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+#. mail:no-delete-special-folder secondary
+#. mail:no-rename-special-folder secondary
+#: mail/mail-errors.xml.h:121 mail/mail-errors.xml.h:125
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -15882,23 +12973,23 @@ msgstr ""
 "Ximian Evolution requiere las carpetas de sistema para funcionar "
 "correctamente y no pueden ser renombradas, movidas o borradas."
 
-#. mail:no-rename-spethal-folder primary
-#: mail/mail-errors.xml.h:118
+#. mail:no-rename-special-folder primary
+#: mail/mail-errors.xml.h:123
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "No se pudo renombrar o mover la carpeta de sistema «{0}»."
 
 #. mail:ask-delete-folder title
-#: mail/mail-errors.xml.h:122
+#: mail/mail-errors.xml.h:127
 msgid "Delete \"{0}\"?"
 msgstr "¿Borrar «{0}»?"
 
 #. mail:ask-delete-folder primary
-#: mail/mail-errors.xml.h:124
+#: mail/mail-errors.xml.h:129
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "¿Seguro que quiere borrar la carpeta «{0}» y todas sus subcarpetas?"
 
 #. mail:ask-delete-folder secondary
-#: mail/mail-errors.xml.h:126
+#: mail/mail-errors.xml.h:131
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -15908,137 +12999,136 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#: mail/mail-errors.xml.h:133 mail/mail-errors.xml.h:137
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "No se puede renombrar «{0}» a «{1}»."
 
 #. mail:no-rename-folder-exists secondary
 #. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+#: mail/mail-errors.xml.h:135 mail/mail-errors.xml.h:197
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
+msgstr "Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
 
 #. mail:no-rename-folder secondary
-#: mail/mail-errors.xml.h:134
+#: mail/mail-errors.xml.h:139
 msgid "Because \"{2}\"."
 msgstr "Porque «{2}»"
 
 #. mail:no-move-folder-nostore primary
 #. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#: mail/mail-errors.xml.h:141 mail/mail-errors.xml.h:145
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "No se puede mover la carpeta «{0}» a «{1}»."
 
 #. mail:no-move-folder-nostore secondary
 #. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#: mail/mail-errors.xml.h:143 mail/mail-errors.xml.h:151
 msgid "Cannot open source \"{2}\"."
 msgstr "No se pudo abrir el origen «{2}»."
 
 #. mail:no-move-folder-to-nostore secondary
 #. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#: mail/mail-errors.xml.h:147 mail/mail-errors.xml.h:155
 msgid "Cannot open target \"{2}\"."
 msgstr "No se pudo abrir el destino «{2}»."
 
 #. mail:no-copy-folder-nostore primary
 #. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#: mail/mail-errors.xml.h:149 mail/mail-errors.xml.h:153
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "No se pudo copiar la carpeta: «{0}» a «{1}»."
 
 #. mail:no-create-folder-nostore primary
-#: mail/mail-errors.xml.h:152
+#: mail/mail-errors.xml.h:157
 msgid "Cannot create folder \"{0}\"."
 msgstr "No se pudo crear la carpeta: «{0}»."
 
 #. mail:no-create-folder-nostore secondary
-#: mail/mail-errors.xml.h:154
+#: mail/mail-errors.xml.h:159
 msgid "Cannot open source \"{1}\""
 msgstr "No se pudo abrir el origen «{1}»"
 
 #. mail:account-incomplete primary
 #. mail:account-notunique primary
-#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#: mail/mail-errors.xml.h:161 mail/mail-errors.xml.h:165
 msgid "Cannot save changes to account."
 msgstr "No se puede guardar los cambios en la cuenta."
 
 #. mail:account-incomplete secondary
-#: mail/mail-errors.xml.h:158
+#: mail/mail-errors.xml.h:163
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
 #. mail:account-notunique secondary
-#: mail/mail-errors.xml.h:162
+#: mail/mail-errors.xml.h:167
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
 #. mail:ask-delete-account title
-#: mail/mail-errors.xml.h:164
+#: mail/mail-errors.xml.h:169
 msgid "Delete account?"
 msgstr "¿Borrar la cuenta?"
 
 #. mail:ask-delete-account primary
-#: mail/mail-errors.xml.h:166
+#: mail/mail-errors.xml.h:171
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Seguro que quiere borrar esta cuenta?"
 
 #. mail:ask-delete-account secondary
-#: mail/mail-errors.xml.h:168
+#: mail/mail-errors.xml.h:173
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continúa, la información de la cuenta se borrará permanentemente."
 
-#: mail/mail-errors.xml.h:169
+#: mail/mail-errors.xml.h:174
 msgid "Don't delete"
 msgstr "No borrar"
 
 #. mail:no-save-signature primary
-#: mail/mail-errors.xml.h:171
+#: mail/mail-errors.xml.h:176
 msgid "Could not save signature file."
 msgstr "No se pudo guardar el archivo de firma."
 
 #. mail:no-save-signature secondary
-#: mail/mail-errors.xml.h:173
+#: mail/mail-errors.xml.h:178
 msgid "Because \"{0}\"."
 msgstr "Porque «{0}»."
 
 #. mail:signature-notscript primary
-#: mail/mail-errors.xml.h:175
+#: mail/mail-errors.xml.h:180
 msgid "Cannot set signature script \"{0}\"."
 msgstr "No se puede establecer el script de firma «{0}»."
 
 #. mail:signature-notscript secondary
-#: mail/mail-errors.xml.h:177
+#: mail/mail-errors.xml.h:182
 msgid "The script file must exist and be executable."
 msgstr "El archivo de script debe existir y ser ejecutable."
 
 #. mail:ask-signature-changed title
-#: mail/mail-errors.xml.h:179
+#: mail/mail-errors.xml.h:184
 msgid "Discard changed?"
 msgstr "¿Descartar los cambios?"
 
 #. mail:ask-signature-changed primary
-#: mail/mail-errors.xml.h:181
+#: mail/mail-errors.xml.h:186
 msgid "Do you wish to save your changes?"
 msgstr "¿Desea guardar los cambios?"
 
 #. mail:ask-signature-changed secondary
-#: mail/mail-errors.xml.h:183
+#: mail/mail-errors.xml.h:188
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta firma ha cambiado, pero no ha sido guardada."
 
-#: mail/mail-errors.xml.h:184
+#: mail/mail-errors.xml.h:189
 msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
 #. mail:vfolder-notexist primary
-#: mail/mail-errors.xml.h:186
+#: mail/mail-errors.xml.h:191
 msgid "Cannot edit vFolder \"{0}\" as it does not exist."
 msgstr "No se puede editar la carpeta virtual «{0}» porque no existe."
 
 #. mail:vfolder-notexist secondary
-#: mail/mail-errors.xml.h:188
+#: mail/mail-errors.xml.h:193
 msgid ""
 "This folder may have been added implictly, go to the virtual folder editor "
 "to add it explictly, if required."
@@ -16047,17 +13137,17 @@ msgstr ""
 "carpetas virtuales para añadirla explícitamente, si lo desea."
 
 #. mail:vfolder-notunique primary
-#: mail/mail-errors.xml.h:190
+#: mail/mail-errors.xml.h:195
 msgid "Cannot add vFolder \"{0}\"."
 msgstr "No se puede añadir la carpeta virtual «{0}»."
 
 #. mail:vfolder-updated primary
-#: mail/mail-errors.xml.h:194
+#: mail/mail-errors.xml.h:199
 msgid "vFolders automatically updated."
 msgstr "Carpetas virtuales automáticamente actualizadas."
 
 #. mail:vfolder-updated secondary
-#: mail/mail-errors.xml.h:196
+#: mail/mail-errors.xml.h:201
 msgid ""
 "The following vFolder(s):\n"
 "{0}\n"
@@ -16072,12 +13162,12 @@ msgstr ""
 "y han sido actualizadas."
 
 #. mail:filter-updated primary
-#: mail/mail-errors.xml.h:202
+#: mail/mail-errors.xml.h:207
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automáticamente."
 
 #. mail:filter-updated secondary
-#: mail/mail-errors.xml.h:204
+#: mail/mail-errors.xml.h:209
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -16092,27 +13182,27 @@ msgstr ""
 "Y han sido actualizadas."
 
 #. mail:no-folder primary
-#: mail/mail-errors.xml.h:210
+#: mail/mail-errors.xml.h:215
 msgid "Missing folder."
 msgstr "Falta la carpeta."
 
 #. mail:no-folder secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:217
 msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
 #. mail:no-name-vfolder secondary
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:221
 msgid "You must name this vFolder."
 msgstr "Debe dar un nombre a esta carpeta virtual."
 
 #. mail:vfolder-no-source primary
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:223
 msgid "No sources selected."
 msgstr "No se ha seleccionado ningún origen."
 
 #. mail:vfolder-no-source secondary
-#: mail/mail-errors.xml.h:220
+#: mail/mail-errors.xml.h:225
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting\n"
@@ -16124,12 +13214,12 @@ msgstr ""
 "remotas, o ambas."
 
 #. mail:ask-migrate-existing primary
-#: mail/mail-errors.xml.h:224
+#: mail/mail-errors.xml.h:229
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problema al migrar la carpeta antigua de correo «{0}»."
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:226
+#: mail/mail-errors.xml.h:231
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -16141,53 +13231,87 @@ msgstr ""
 "Puede elegir ignorar esta carpeta, sobreescribirla o agregar su contenido, o "
 "salir.\n"
 
-#: mail/mail-errors.xml.h:230
+#: mail/mail-errors.xml.h:235
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:236 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
-#: mail/mail-errors.xml.h:232
+#: mail/mail-errors.xml.h:237
 msgid "_Append"
 msgstr "_Agregar"
 
+#. mail:no-load-license primary
+#: mail/mail-errors.xml.h:239
+msgid "Unable to read license file."
+msgstr "No se pudo leer el archivo de licencia."
+
+#. mail:no-load-license secondary
+#: mail/mail-errors.xml.h:241
+msgid ""
+"Cannot read the license file \"{0}\", due to an\n"
+"      installation problem.  You will not be able to use this provider "
+"until\n"
+"      you can accept its license."
+msgstr ""
+"No se pudo leer el archivo de licencia «{0}», debido a un\n"
+"problema de instalación. No será posible usar este proveedor\n"
+"hasta que pueda aceptar esta licencia."
+
+#. mail:checking-service title
+#: mail/mail-errors.xml.h:245
+msgid "Querying server"
+msgstr "Consultando al servidor"
+
+#. mail:checking-service primary
+#: mail/mail-errors.xml.h:247
+msgid "Please wait."
+msgstr "Por favor espere."
+
+#. mail:checking-service secondary
+#: mail/mail-errors.xml.h:249
+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:gw-accountsetup-error primary
-#: mail/mail-errors.xml.h:234
+#: mail/mail-errors.xml.h:251
 msgid ""
 "Unable to connect to the GroupWise\n"
 "server."
 msgstr ""
-"No es posible conectarse con el \n"
-"servidor GroupWise"
+"No es posible conectarse con el servidor\n"
+"GroupWise."
 
 #. mail:gw-accountsetup-error secondary
-#: mail/mail-errors.xml.h:237
+#: mail/mail-errors.xml.h:254
 msgid ""
 "\n"
 "Please check your account settings and try again.\n"
-msgstr "\nCompruebe su configuración de la cuenta e inténtelo otra vez.\n"
+msgstr ""
+"\n"
+"Compruebe su configuración de la cuenta e inténtelo otra vez.\n"
 
-#: mail/mail-folder-cache.c:795
+#: mail/mail-folder-cache.c:813
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: mail/mail-ops.c:98
+#: mail/mail-ops.c:101
 msgid "Filtering Folder"
 msgstr "Filtrando carpeta"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:556
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falló al aplicar los filtros al correo saliente: %s"
 
-#: mail/mail-ops.c:567
+#: mail/mail-ops.c:581
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16196,115 +13320,114 @@ msgstr ""
 "Falló al anexar a %s: %s\n"
 "Anexando a la carpeta local «Correo enviado» en su lugar."
 
-#: mail/mail-ops.c:576
+#: mail/mail-ops.c:590
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falló al anexar a la carpeta local «Correo enviado»: %s"
 
-#: mail/mail-ops.c:672
+#: mail/mail-ops.c:687
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:703
+#: mail/mail-ops.c:718
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Fallo al enviar %d de %d mensajes"
 
-#: mail/mail-ops.c:707
+#: mail/mail-ops.c:720 mail/mail-send-recv.c:607
+msgid "Cancelled."
+msgstr "Cancelado."
+
+#: mail/mail-ops.c:722
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:804
+#: mail/mail-ops.c:819
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:889
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:889
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:1002
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Analizando carpetas en «%s»"
-
-#: mail/mail-ops.c:1115
+#: mail/mail-ops.c:1130
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1158
+#: mail/mail-ops.c:1173
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1230
+#: mail/mail-ops.c:1245
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1308
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1402
+#: mail/mail-ops.c:1417
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: mail/mail-ops.c:1467
+#: mail/mail-ops.c:1482
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta «%s»"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta «%s»"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1538
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
+#: mail/mail-ops.c:1574 mail/mail-ops.c:1625
 msgid "Expunging folder"
 msgstr "Compactando carpeta"
 
-#: mail/mail-ops.c:1607
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1623
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: mail/mail-ops.c:1691
+#: mail/mail-ops.c:1706
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1763
+#: mail/mail-ops.c:1778
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Descargando %d mensaje"
 msgstr[1] "Descargando %d mensajes"
 
-#: mail/mail-ops.c:1849
+#: mail/mail-ops.c:1864
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
-#: mail/mail-ops.c:1899
+#: mail/mail-ops.c:1914
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16313,7 +13436,7 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1927
+#: mail/mail-ops.c:1942
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16322,11 +13445,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2013
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2010
+#: mail/mail-ops.c:2025
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16335,36 +13458,40 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2035
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: mail/mail-ops.c:2168
+#: mail/mail-ops.c:2185
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2168
+#: mail/mail-ops.c:2185
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: mail/mail-send-recv.c:157
+#: mail/mail-ops.c:2301
+msgid "Checking Service"
+msgstr "Comprobando el servicio"
+
+#: mail/mail-send-recv.c:158
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:264
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:266
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ruta: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:268
+#: mail/mail-send-recv.c:269
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
@@ -16377,59 +13504,60 @@ msgstr "Enviar y recibir correo"
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: mail/mail-send-recv.c:412
+#: mail/mail-send-recv.c:410
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:462
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:207
+#: mail/mail-session.c:208
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: mail/mail-session.c:209
+#: mail/mail-session.c:210
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
-#: mail/mail-signature-editor.c:371
+#: mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Editar firma"
 
-#: mail/mail-signature-editor.c:411
+#: mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Introduzca un nombre para esta firma."
 
-#: mail/mail-signature-editor.c:414
+#: mail/mail-signature-editor.c:415
+#: plugins/shared-folder/properties.glade.h:11
 msgid "Name:"
 msgstr "Nombre:"
 
-#: mail/mail-tools.c:114
+#: mail/mail-tools.c:115
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "No se pudo crear el directorio spool «%s»: %s"
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:142
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Intentando mover correo desde un origen que no es un buzón «%s»"
 
-#: mail/mail-tools.c:276
+#: mail/mail-tools.c:277
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaje reenviado - %s"
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:279
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:319
+#: mail/mail-tools.c:320
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Carpeta inválida: «%s»"
@@ -16449,79 +13577,85 @@ msgstr "Actualizando carpetas virtuales para %s: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Actualizando carpetas virtuales para «%s»"
 
-#: mail/mail-vfolder.c:942
+#: mail/mail-vfolder.c:961
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:981
+#: mail/mail-vfolder.c:1000
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:1065
+#: mail/mail-vfolder.c:1084
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-list.c:1000
+#: mail/message-list.c:999
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1000
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:1002
+#: mail/message-list.c:1001
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1002
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: mail/message-list.c:1004
+#: mail/message-list.c:1003
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: mail/message-list.c:1008
+#: mail/message-list.c:1007
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1008
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:1013
+#: mail/message-list.c:1012
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:1013
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:1337
+#: mail/message-list.c:1341
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1344
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: mail/message-list.c:1348 plugins/itip-formatter/itip-view.c:160
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1353
+#: mail/message-list.c:1357
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1365
+#: mail/message-list.c:1369
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1373
+#: mail/message-list.c:1377
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1375
+#: mail/message-list.c:1379
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3380
+#: mail/message-list.c:2044
+msgid "Message List"
+msgstr "Lista de mensajes"
+
+#: mail/message-list.c:3381
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -16553,39 +13687,39 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
-#: mail/message-tag-followup.c:73
+#: mail/message-tag-followup.c:74
 msgid "Call"
 msgstr "Llamar"
 
-#: mail/message-tag-followup.c:74
+#: mail/message-tag-followup.c:75
 msgid "Do Not Forward"
 msgstr "No reenviar"
 
-#: mail/message-tag-followup.c:75
+#: mail/message-tag-followup.c:76
 msgid "Follow-Up"
 msgstr "Seguir el mensaje"
 
-#: mail/message-tag-followup.c:76
+#: mail/message-tag-followup.c:77
 msgid "For Your Information"
 msgstr "Para su información"
 
-#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/message-tag-followup.c:78
+#: mail/message-tag-followup.c:79
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: mail/message-tag-followup.c:82
+#: mail/message-tag-followup.c:83
 msgid "Review"
 msgstr "Revisar"
 
@@ -16621,39 +13755,814 @@ msgstr "El asunto contiene"
 msgid "Subject does not contain"
 msgstr "El asunto no contiene"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Intérprete de Evolution"
+#: plugins/backup-restore/backup.c:109
+msgid "Backup Evolution directory"
+msgstr "Respaldar el directorio de Evolution"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Prueba de Evolution"
+#: plugins/backup-restore/backup.c:111
+msgid "Restore Evolution directory"
+msgstr "Restaurar el directorio de Evolution"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Componente de Prueba de Evolution"
+#: plugins/backup-restore/backup.c:113
+msgid "Check Evolution archive"
+msgstr "Comprobar el archivo de Evolution"
+
+#: plugins/backup-restore/backup.c:115
+msgid "Restart Evolution"
+msgstr "Reiniciar Evolution"
+
+#: plugins/backup-restore/backup-restore.c:51
+msgid "Select name of Evolution archive"
+msgstr "Seleccione el nombre del archivo de Evolution"
+
+#: plugins/backup-restore/backup-restore.c:61
+msgid "_Restart Evolution after backup"
+msgstr "_Reinicia Evolution después del respaldo"
+
+#: plugins/backup-restore/backup-restore.c:89
+msgid "Select Evolution archive to restore"
+msgstr "Seleccione el archivo de Evolution para restaurar"
+
+#: plugins/backup-restore/backup-restore.c:97
+msgid "_Restart Evolution after restore"
+msgstr "_Reiniciar Evolution después del respaldo"
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+msgid "Backup Settings..."
+msgstr "Configuración de la restauración..."
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "Backup and restore Evolution data and settings"
+msgstr "Respaldar y restaurar los datos de Evolution y la configuración"
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+msgid "Restore Settings..."
+msgstr "Restaurar la configuración..."
+
+#: plugins/bbdb/bbdb.c:388
+msgid "Automatic Contacts"
+msgstr "Contactos automáticos"
+
+#: plugins/bbdb/bbdb.c:397
+msgid "<span weight=\"bold\">Automatic Contacts</span>"
+msgstr "<span weight=\"bold\">Contactos automáticos</span>"
+
+#. Enable BBDB checkbox
+#: plugins/bbdb/bbdb.c:410
+msgid "_Automatically create entries in the addressbook when responding to mail"
+msgstr "Crear entradas _automáticamente en la libreta de direcciones cuando se responda al correo"
+
+#: plugins/bbdb/bbdb.c:428
+msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+msgstr "<span weight=\"bold\">Contactos de mensajería instantánea</span>"
+
+#. Enable Gaim Checkbox
+#: plugins/bbdb/bbdb.c:441
+msgid ""
+"Periodically synchronize contact information and images from my _instant "
+"messenger"
+msgstr "Sincronizar periódicamente la información de contacto y las imágenes desde mi mensajería _instantánea"
+
+#. Synchronize now button.
+#: plugins/bbdb/bbdb.c:448
+msgid "Synchronize with _buddy list now"
+msgstr "Sincronizar con la lista de _compañeros ahora"
+
+#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Desuscribiéndose de la carpeta «%s»"
+
+#: plugins/groupwise-account-setup/camel-gw-listener.c:413
+msgid "Checklist"
+msgstr "Lista de comprobación"
+
+#: plugins/itip-formatter/itip-formatter.c:697
+msgid "Unable to parse item"
+msgstr "No se pudo interpretar el elemento"
+
+#: plugins/itip-formatter/itip-formatter.c:750
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "No se pudo enviar el elemento al calendario «%s»: %s"
+
+#: plugins/itip-formatter/itip-formatter.c:761
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "Enviado al calendario «%s» como aceptado"
+
+#: plugins/itip-formatter/itip-formatter.c:765
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "Enviado al calendario «%s» como tentativa"
+
+#: plugins/itip-formatter/itip-formatter.c:770
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "Enviado al calendario «%s» como declinado"
+
+#: plugins/itip-formatter/itip-formatter.c:775
+#, c-format
+msgid "Sent to calendar '%s' as cancelled"
+msgstr "Enviado al calendario «%s» como cancelado"
+
+#: plugins/itip-formatter/itip-formatter.c:825
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr "El estado de asistencia no pudo ser actualizado a causa de un estado inválido"
+
+#: plugins/itip-formatter/itip-formatter.c:836
+#, c-format
+msgid "Unable to update attendee statusAttendee status updated. %s"
+msgstr "Imposible actualizar el estado del asistente. Estado del asistente actualizado. %s"
+
+#: plugins/itip-formatter/itip-formatter.c:840
+msgid "Attendee status updated"
+msgstr "Estado de asistencia actualizado"
+
+#: plugins/itip-formatter/itip-formatter.c:965
+msgid "The calendar attached is not valid"
+msgstr "El calendario adjunto no es válido"
+
+#: plugins/itip-formatter/itip-formatter.c:966
+msgid ""
+"The message claims to contain a calendar, but the calendar is not valid "
+"iCalendar."
+msgstr "El mensaje dice contener un calendario, pero el calendario no es un iCalendar válido ."
+
+#: plugins/itip-formatter/itip-formatter.c:1000
+#: plugins/itip-formatter/itip-formatter.c:1056
+msgid "The item in the calendar is not valid"
+msgstr "El elemento en el calendario no es válido"
+
+#: plugins/itip-formatter/itip-formatter.c:1001
+#: plugins/itip-formatter/itip-formatter.c:1057
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr "El mensaje contiene un calendario, pero el calendario no contiene ningún acontecimiento, tarea o información de disponibilidad"
+
+#: plugins/itip-formatter/itip-formatter.c:1012
+msgid "The calendar attached contains multiple items"
+msgstr "El calendario adjunto contiene elementos múltiples"
+
+#: plugins/itip-formatter/itip-formatter.c:1013
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr "Para procesar todos estos elementos, el archivo debería guardarse y el calendario importarse"
+
+#: plugins/itip-formatter/itip-formatter.c:1632
+msgid "Meetings and Tasks"
+msgstr "Reuniones y tareas"
+
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: plugins/itip-formatter/itip-formatter.c:1655
+msgid "_Delete message after acting"
+msgstr "_Borrar el mensaje después de actuar"
+
+#: plugins/itip-formatter/itip-formatter.c:1665
+msgid "<span weight=\"bold\">Conflict Search</span>"
+msgstr "<span weight=\"bold\">Buscar conflicto</span>"
+
+#. Source selector
+#: plugins/itip-formatter/itip-formatter.c:1678
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:146 ui/evolution-calendar.xml.h:34
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:450
+msgid "Today"
+msgstr "Hoy"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:151
+msgid "Today %H:%M"
+msgstr "Hoy %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:155
+msgid "Today %H:%M:%S"
+msgstr "Hoy %H:%M %S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:164
+msgid "Today %l:%M:%S %p"
+msgstr "Hoy %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:172
+#: plugins/itip-formatter/itip-view.c:224
+msgid "%A, %B %e"
+msgstr "%A, %e de %B"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:177
+#: plugins/itip-formatter/itip-view.c:229
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e de %B %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:181
+#: plugins/itip-formatter/itip-view.c:233
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e de %B %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:186
+#: plugins/itip-formatter/itip-view.c:238
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e de %B %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:190
+#: plugins/itip-formatter/itip-view.c:242
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e de %B %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:198
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:203
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:207
+msgid "%A %H:%M:%S"
+msgstr "%A, %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:212
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:216
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:248
+msgid "%A, %B %e, %Y"
+msgstr "%A, %e de %B de %Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:253
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %e de %B de %Y a las %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:257
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %e de %B de %Y, %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:262
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %e de %B de %Y, %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:266
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A %e de %B de %Y, %l:%M %p"
+
+#: plugins/itip-formatter/itip-view.c:291
+#, c-format
+msgid "<b>%s</b> through %s has published the following meeting information:"
+msgstr "<b>%s</b> ha publicado información de reunión a través de %s:"
+
+#: plugins/itip-formatter/itip-view.c:293
+#, c-format
+msgid "<b>%s</b> has published the following meeting information:"
+msgstr "<b>%s</b> ha publicado la siguiente información de reunión:"
+
+#: plugins/itip-formatter/itip-view.c:298
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at the following meeting:"
+msgstr "<b>%s</b> solicita la presencia de %s en la reunión siguiente:"
+
+#: plugins/itip-formatter/itip-view.c:301
+#, c-format
+msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+msgstr "<b>%s</b> solicita su presencia en la siguiente reunión a través de %s:"
+
+#: plugins/itip-formatter/itip-view.c:303
+#, c-format
+msgid "<b>%s</b> requests your presence at the following meeting:"
+msgstr "<b>%s</b> solicita su presencia en la siguiente reunión:"
+
+#: plugins/itip-formatter/itip-view.c:309
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgstr "<b>%s</b> desea apuntarse a una reunión existente a través de %s:"
+
+#: plugins/itip-formatter/itip-view.c:311
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgstr "<b>%s</b> desea apuntarse a una reunión existente:"
+
+#: plugins/itip-formatter/itip-view.c:314
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> desea recibir la última información de la reunión siguiente:"
+
+#: plugins/itip-formatter/itip-view.c:317
+#, c-format
+msgid "<b>%s</b> has sent back the following meeting response:"
+msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la reunión:"
+
+#: plugins/itip-formatter/itip-view.c:321
+#, c-format
+msgid "<b>%s</b> through %s has cancelled the following meeting:"
+msgstr "<b>%s</b> ha cancelado la siguiente reunión a través de %s:"
+
+#: plugins/itip-formatter/itip-view.c:323
+#, c-format
+msgid "<b>%s</b> has cancelled the following meeting."
+msgstr "<b>%s</b> ha cancelado la reunión siguiente."
+
+#: plugins/itip-formatter/itip-view.c:326
+#, c-format
+msgid "<b>%s</b> has proposed the following meeting changes."
+msgstr "<b>%s</b> ha propuesto los cambios siguientes para la reunión."
+
+#: plugins/itip-formatter/itip-view.c:330
+#, c-format
+msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgstr "<b>%s</b> ha declinado los siguientes cambios para la reunión a través de %s:"
+
+#: plugins/itip-formatter/itip-view.c:332
+#, c-format
+msgid "<b>%s</b> has declined the following meeting changes."
+msgstr "<b>%s</b> ha declinado los cambios siguientes para la reunión."
+
+#: plugins/itip-formatter/itip-view.c:359
+#, c-format
+msgid "<b>%s</b> through %s has published the following task:"
+msgstr "<b>%s</b> ha publicado la siguiente tarea a través de %s:"
+
+#: plugins/itip-formatter/itip-view.c:361
+#, c-format
+msgid "<b>%s</b> has published the following task:"
+msgstr "<b>%s</b> ha publicado la tarea siguiente:"
+
+#: plugins/itip-formatter/itip-view.c:366
+#, c-format
+msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgstr "<b>%s</b> solicita la asignación de %s para la siguiente tarea:"
+
+#: plugins/itip-formatter/itip-view.c:369
+#, c-format
+msgid "<b>%s</b> through %s has assigned you a task:"
+msgstr "<b>%s</b> a través de %s le ha asignado una tarea:"
+
+#: plugins/itip-formatter/itip-view.c:371
+#, c-format
+msgid "<b>%s</b> has assigned you a task:"
+msgstr "<b>%s</b> le ha asignado a usted una tarea:"
+
+#: plugins/itip-formatter/itip-view.c:377
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgstr "<b>%s</b> a través de %s desea añadirse a una tarea existente:"
+
+#: plugins/itip-formatter/itip-view.c:379
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task:"
+msgstr "<b>%s</b> desea añadirse a una tarea existente:"
+
+#: plugins/itip-formatter/itip-view.c:382
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
+msgstr "<b>%s</b> quiere recibir la última información para la siguiente tarea asignada:"
+
+#: plugins/itip-formatter/itip-view.c:385
+#, c-format
+msgid "<b>%s</b> has sent back the following assigned task response:"
+msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la tarea:"
+
+#: plugins/itip-formatter/itip-view.c:389
+#, c-format
+msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+msgstr "<b>%s</b> ha cancelado la siguiente asignación de tarea a través de %s:"
+
+#: plugins/itip-formatter/itip-view.c:391
+#, c-format
+msgid "<b>%s</b> has cancelled the following assigned task:"
+msgstr "<b>%s</b> ha cancelado la siguiente tarea asignada:"
+
+#: plugins/itip-formatter/itip-view.c:394
+#, c-format
+msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgstr "<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas:"
+
+#: plugins/itip-formatter/itip-view.c:398
+#, c-format
+msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgstr "<b>%s</b> has declinado la siguiente tarea asignada a través de %s:"
+
+#: plugins/itip-formatter/itip-view.c:400
+#, c-format
+msgid "<b>%s</b> has declined the following assigned task:"
+msgstr "<b>%s</b> ha declinado la siguiente tarea asignada:"
+
+#. Comment
+#: plugins/itip-formatter/itip-view.c:846
+#: plugins/itip-formatter/itip-view.c:896
+msgid "Comment:"
+msgstr "Comentario:"
+
+#. org.gnome.mailing-list-actions:no-header primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+msgid "Action not available"
+msgstr "Acción no disponible"
+
+#. org.gnome.mailing-list-actions:no-header secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr "Este mensaje no  contiene la información de cabecera requerida para esta acción."
+
+#. org.gnome.mailing-list-actions:posting-not-allowed primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+msgid "Posting not allowed"
+msgstr "Publicación no permitida"
+
+#. org.gnome.mailing-list-actions:posting-not-allowed secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr "No está permitido publicar en esta lista de correo. Posiblemente esta es una lista de correo de sólo lectura. contacte con el responsable de la lista para más detalles."
+
+#. org.gnome.mailing-list-actions:ask-send-message primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+msgid "Send e-mail message to mailing list?"
+msgstr "¿Desea enviar un mensaje a la lista de correo?"
+
+#. org.gnome.mailing-list-actions:ask-send-message secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+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."
+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-errors.xml.h:15
+msgid "_Send message"
+msgstr "_Enviar mensaje"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+msgid "_Edit message"
+msgstr "_Editar mensaje"
+
+#. org.gnome.mailing-list-actions:malformed-header primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
+msgid "Malformed header"
+msgstr "Cabecera mal formada"
+
+#. org.gnome.mailing-list-actions:malformed-header secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+"La cabecera {0} de este mensaje está mal formada y no se pudo procesar.\n"
+"\n"
+"Cabecera: {1}"
+
+#. org.gnome.mailing-list-actions:no-action primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
+msgid "No e-mail action"
+msgstr "Sin acción de correo-e"
+
+#. org.gnome.mailing-list-actions:no-action secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+msgid ""
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
+"\n"
+"Header: {0}"
+msgstr ""
+"La acción no se pudo realizar. Esto significa que la cabecera para esta acción no contenía ninguna acción que pudiésemos tratar.\n"
+"\n"
+"Cabecera: {0}"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+msgid "Contact list _owner"
+msgstr "_Responsable de la lista de contactos"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "Contactar con el responsable de la lista de correo a la que pertenece este mensaje"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get an archive of the list this message belongs to"
+msgstr "Obtener un archivo de la lista a la que pertenece este mensaje"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "Obtiene información sobre el uso de la lista a la que pertenece este mensaje"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get list _archive"
+msgstr "Obtener _archivo de la lista"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+msgid "Get list _usage information"
+msgstr "Obtener información de _uso de la lista"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+msgid "Mailing _List"
+msgstr "_Lista de correo"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Suscribirse a la lista de correo a la que pertenece este mensaje"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr "Desubscribirse a la lista de correo a la que pertenece este mensaje"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+msgid "_Post message to list"
+msgstr "_Publicar un mensaje a la lista"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+msgid "_Subscribe to list"
+msgstr "_Suscribirse a la lista"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+msgid "_Un-subscribe to list"
+msgstr "Des_uscribirse de la lista"
+
+#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+msgid "Enable and disable plugins"
+msgstr "Activar y desactivar complementos"
+
+#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+msgid "Manage Plugins..."
+msgstr "Administrar complementos..."
+
+#: plugins/plugin-manager/plugin-manager.c:45
+msgid "Author(s)"
+msgstr "Autores(s)"
+
+#: plugins/plugin-manager/plugin-manager.c:46
+msgid "Id"
+msgstr "Id"
+
+#: plugins/plugin-manager/plugin-manager.c:47
+msgid "Path"
+msgstr "Ruta"
+
+#: plugins/plugin-manager/plugin-manager.c:48
+msgid "Description"
+msgstr "Descripción"
+
+#. Setup the ui
+#: plugins/plugin-manager/plugin-manager.c:188
+msgid "Plugin Manager"
+msgstr "Administrador de complementos"
+
+#: plugins/plugin-manager/plugin-manager.c:201
+msgid "Note: Some changes will not take effect until restart"
+msgstr "Nota: Algunos cambios no tendrán efecto hasta que reinicie"
+
+#: plugins/plugin-manager/plugin-manager.c:210
+msgid "Plugin"
+msgstr "Complemento"
+
+#: plugins/prefer-plain/prefer-plain.c:105
+msgid "Show HTML if present"
+msgstr "Mostrar HTML si está presente"
+
+#: plugins/prefer-plain/prefer-plain.c:106
+msgid "Prefer PLAIN"
+msgstr "Preferir sin formato"
+
+#: plugins/prefer-plain/prefer-plain.c:107
+msgid "Only ever show PLAIN"
+msgstr "Sólo mostrar sin formato"
+
+#: plugins/prefer-plain/prefer-plain.c:150
+msgid "HTML Mode"
+msgstr "Modo HTML"
+
+#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+msgid "Save Attachments ..."
+msgstr "Guardar adjuntos..."
+
+#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+msgid "Save all attachments"
+msgstr "Guarda todos los adjuntos"
+
+#: plugins/save-attachments/save-attachments.c:331
+msgid "Select save base name"
+msgstr "Seleccione un nombre base para guardar"
+
+#: plugins/save-attachments/save-attachments.c:351
+msgid "MIME Type"
+msgstr "Tipo MIME"
+
+#: plugins/save-attachments/save-attachments.c:359
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Guardar"
+
+#: plugins/save-calendar/csv-format.c:167
+#, c-format
+msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+
+#: plugins/save-calendar/csv-format.c:370
+#, c-format
+msgid ""
+"Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
+"sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
+"sAttendees List%sLocation%sModified%s"
+msgstr ""
+"Uid%sResumen%sLista de descripción%sLista de categorías%sLista de comentarios%sCompletado%"
+"sCreado%sLista de contactos%sInicio%sFin%sVencimeinto%sPorcentaje terminado%sPrioridad%sUrl%"
+"sLista de asistentes%sLugar%sModificado%s"
+
+#: plugins/save-calendar/csv-format.c:519
+msgid "Advanced options for the CSV format"
+msgstr "Opciones avanzadas para el formato CSV"
+
+#: plugins/save-calendar/csv-format.c:526
+msgid "Prepend a header"
+msgstr "Anteponer una cabecera"
+
+#: plugins/save-calendar/csv-format.c:535
+msgid "Value delimiter:"
+msgstr "Delimitador de valor:"
+
+#: plugins/save-calendar/csv-format.c:541
+msgid "Record delimiter:"
+msgstr "Delimitador de registro:"
+
+#: plugins/save-calendar/csv-format.c:547
+msgid "Encapsulate values with:"
+msgstr "Encapsular valores con:"
+
+#: plugins/save-calendar/csv-format.c:569
+msgid "Comma separated value format (.csv)"
+msgstr "Formato de valores separados por comas (.csv)"
+
+#: plugins/save-calendar/ical-format.c:120
+msgid "iCalendar format (.ics)"
+msgstr "Formato iCalendar (.ics)"
+
+#: plugins/save-calendar/rdf-format.c:390
+msgid "RDF format (.rdf)"
+msgstr "Formato RDF (.rdf)"
+
+#: plugins/save-calendar/save-calendar.c:172
+#: plugins/save-calendar/save-calendar.c:182
+msgid "Select destination file"
+msgstr "Seleccione archivo de destino"
+
+#: plugins/save-calendar/save-calendar.c:217
+#, c-format
+msgid ""
+"The suggested filename extension of this filetype (%s) is unused in the "
+"chosen filename. Do you want to continue?"
+msgstr "La extensión del nombre de archivo sugerida de este tipo de archivo (%s) no está usada en el nombre de archivo elegido. ¿Quiere continuar?"
+
+#: plugins/shared-folder/properties.glade.h:1
+msgid ""
+"\n"
+"Share List"
+msgstr ""
+"\n"
+"Lista de compartidos"
+
+#: plugins/shared-folder/properties.glade.h:4
+msgid "Ad_d"
+msgstr "_Añadir"
+
+#: plugins/shared-folder/properties.glade.h:5
+msgid "Additional Access"
+msgstr "Acceso adicional"
+
+#: plugins/shared-folder/properties.glade.h:7
+msgid "Delet_e"
+msgstr "_Borrar"
+
+#: plugins/shared-folder/properties.glade.h:8
+msgid "Edi_t"
+msgstr "_Editar"
+
+#: plugins/shared-folder/properties.glade.h:10
+msgid "Message"
+msgstr "Mensaje"
+
+#: plugins/shared-folder/properties.glade.h:12
+msgid "Sen_d Custom Notification"
+msgstr "_Enviar notificación personalizada"
+
+#: plugins/shared-folder/properties.glade.h:13
+msgid "Shared Folder Notification"
+msgstr "Notificación de carpeta compartida"
+
+#: plugins/shared-folder/properties.glade.h:15
+msgid "The participants will receive the following notification.\n"
+msgstr "Los participantes recibirán la notificación siguiente.\n"
+
+#: plugins/shared-folder/properties.glade.h:18
+msgid "_Not Shared"
+msgstr "_Sin compartir"
+
+#: plugins/shared-folder/properties.glade.h:20
+msgid "_Shared With ..."
+msgstr "_Compartir con..."
+
+#: plugins/shared-folder/properties.glade.h:21
+msgid "_Sharing"
+msgstr "_Compartir"
+
+#: plugins/shared-folder/share-folder-common.c:315
+msgid "Users"
+msgstr "Usuarios"
+
+#: plugins/shared-folder/share-folder-common.c:316
+msgid "Enter the users and set permissions"
+msgstr "Introduzca los usuarios y establezca permisos"
+
+#: plugins/shared-folder/share-folder-common.c:402
+msgid "Sharing"
+msgstr "Compartir"
+
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: plugins/subject-thread/subject-thread.c:54
+msgid "Fall back to threading messages by sub_ject"
+msgstr "Volver a conversaciones por _asunto"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
+msgid "Button style"
+msgstr "Estilo de los botones"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+msgid "Buttons are visible"
+msgstr "Los botones son visibles"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Anchura predeterminada del panel de la barra de carpetas"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:2
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
 msgstr "Altura predeterminada de la ventana"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window width"
 msgstr "Anchura predeterminada de la ventana"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Evolution configuration version"
 msgstr "Versión de la configuración de Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Id o alias del componente a ser mostrado por omisión al inicio."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
@@ -16661,7 +14570,7 @@ msgstr ""
 "Si se establece a verdadero, Evolution se iniciará en modo desconectado en "
 "vez de en modo conectado."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
@@ -16669,29 +14578,38 @@ msgstr ""
 "Si se establece a verdadero, el diálogo de advertencia en las versiones de "
 "desarrollo de Evolution no se mostrará."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Last upgraded Evolution configuration version"
 msgstr "Última versión de la configuración actualizada de Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgstr "Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
+"The style of the displayed buttons. Can be text, icons, both, toolbar. If "
+"toolbar is set, the style of the toolbar is followed as determined by the "
+"GNOME setting."
+msgstr "El estilo de los botones. Puede ser texto, iconos, ambos, barra de herramientas. Si  se selecciona barra de herramientas, el estilo de la barra de herramientas sigue lo que esté determinado por la configuración de Gnome."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Toolbar is visible"
 msgstr "La barra de herramientas es visible"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Indica si Evolution debería iniciarse en modo desconectado"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+msgid "Whether the buttons should be visible."
+msgstr "Indica si la los botones deben ser visibles."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "Whether the toolbar should be visible."
 msgstr "Indica si la barra de herramientas debería ser visible."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "Whether to skip the development warning dialog"
 msgstr "Indica si debe saltar el diálogo de advertencia de desarrollo"
 
@@ -16707,7 +14625,36 @@ msgstr "Conexiones activas"
 msgid "Click OK to close these connections and go offline"
 msgstr "Pulse Aceptar para cerrar estas conexiones y quedar desconectado"
 
-#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
+#: shell/e-shell.c:597
+msgid "Uknown system error."
+msgstr "Error de sistema desconocido."
+
+#: shell/e-shell.c:805 shell/e-shell.c:806
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KiB"
+
+#: shell/e-shell.c:1249 widgets/misc/e-cell-date-edit.c:256
+msgid "OK"
+msgstr "Aceptar"
+
+#: shell/e-shell.c:1251
+msgid "Invalid arguments"
+msgstr "Argumentos inválidos"
+
+#: shell/e-shell.c:1253
+msgid "Cannot register on OAF"
+msgstr "No se pudo registrar en OAF"
+
+#: shell/e-shell.c:1255
+msgid "Configuration Database not found"
+msgstr "No se encontró la base de datos de configuración"
+
+#: shell/e-shell.c:1257
+msgid "Generic error"
+msgstr "Error genérico"
+
+#: shell/e-shell-folder-title-bar.c:586 shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
@@ -16843,11 +14790,11 @@ msgstr "Imposible ejecutar importador"
 msgid "_Import"
 msgstr "_Importar"
 
-#: shell/e-shell-offline-handler.c:594
+#: shell/e-shell-offline-handler.c:589
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Preferencias de Evolution"
 
@@ -16875,8 +14822,7 @@ msgstr "No ha especificado un nombre de carpeta."
 
 #: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
-msgstr ""
-"El nombre de la carpeta no puede contener el carácter de retorno de carro."
+msgstr "El nombre de la carpeta no puede contener el carácter de retorno de carro."
 
 #: shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
@@ -16890,10 +14836,26 @@ msgstr "El nombre de la carpeta no puede contener el carácter «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' y '..' son nombres reservados de carpetas."
 
+#: shell/e-shell-window.c:341
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution está conectado.  Pulse este botón para trabajar desconectado."
+
+#: shell/e-shell-window.c:349
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution está en proceso de desconectarse."
+
+#: shell/e-shell-window.c:356
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution está desconectado.  Pulse este botón para trabajar conectado."
+
+#: shell/e-shell-window.c:708
+#, c-format
+msgid "Switch to %s"
+msgstr "Cambiar a %s"
+
 #: shell/e-shell-window-commands.c:67
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
 #: shell/e-shell-window-commands.c:75
 #, c-format
@@ -16906,73 +14868,32 @@ msgstr "Bug Buddy no está instalado."
 
 #: shell/e-shell-window-commands.c:132
 msgid "Bug buddy could not be run."
-msgstr "No se ha podido ejecutar bug Buddy."
+msgstr "No se ha podido ejecutar Bug Buddy."
+
+#. The translator-credits string is for translators to list
+#. * per language credits for translation, displayed in the
+#. * about box
+#: shell/e-shell-window-commands.c:425
+msgid "translator-credits"
+msgstr "Francisco Javier F. Serrador"
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:439
 msgid "Groupware Suite"
 msgstr "Suite de trabajo en grupo"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:680
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:693 ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:706 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution está conectado.  Pulse este botón para trabajar desconectado."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution está en proceso de desconectarse."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution está desconectado.  Pulse este botón para trabajar conectado."
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Cambiar a %s"
-
-#: shell/e-shell.c:585
-msgid "Uknown system error."
-msgstr "Error de sistema desconocido."
-
-#: shell/e-shell.c:789 shell/e-shell.c:790
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KiB"
-
-#: shell/e-shell.c:1210 widgets/misc/e-cell-date-edit.c:265
-msgid "OK"
-msgstr "Aceptar"
-
-#: shell/e-shell.c:1212
-msgid "Invalid arguments"
-msgstr "Argumentos inválidos"
-
-#: shell/e-shell.c:1214
-msgid "Cannot register on OAF"
-msgstr "No se pudo registrar en OAF"
-
-#: shell/e-shell.c:1216
-msgid "Configuration Database not found"
-msgstr "No se encontró la base de datos de configuración"
-
-#: shell/e-shell.c:1218
-msgid "Generic error"
-msgstr "Error genérico"
-
-#: shell/e-user-creatable-items-handler.c:691
+#: shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Nuevo"
 
@@ -16994,26 +14915,25 @@ msgstr "Bienvenido"
 
 #: shell/evolution-startup-wizard.glade.h:6
 msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Bienvenido a Evolution. Las siguientes pantallas permitirán \n"
-"a Evolution conectarse a sus cuentas de correo, e importar \n"
+"Bienvenido a Evolution. Las siguientes pantallas permitirán "
+"a Evolution conectarse a sus cuentas de correo, e importar "
 "archivos desde otras aplicaciones. \n"
 "\n"
-"Por favor pulse el botón «Siguiente» para continuar. "
+"Por favor pulse el botón «Adelante» para continuar. "
 
-#: shell/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:9
 msgid ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
+"You have successfully entered all of the information needed to set up "
+"Evolution. \n"
 "\n"
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
-"Ha introducido toda la información necesaria para\n"
+"Ha introducido toda la información necesaria para "
 "configurar Evolution. \n"
 "\n"
 "Pulse el botón «Aplicar» para guardar su configuración. "
@@ -17030,6 +14950,18 @@ msgstr "_Prueba"
 msgid "Create a new test item"
 msgstr "Crea una elemento de prueba nuevo"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Intérprete de Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Prueba de Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Componente de Prueba de Evolution"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Pulse «Importar» para comenzar a importar el archivo en Evolution. "
@@ -17044,7 +14976,7 @@ msgstr "Importar archivo"
 
 #: shell/importer/import.glade.h:4
 msgid "Import Location"
-msgstr "Ubicación de importación"
+msgstr "Lugar de importación"
 
 #: shell/importer/import.glade.h:5
 msgid "Importer Type"
@@ -17089,7 +15021,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution puede importar datos de los siguiente s archivos:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:226
+#: shell/main.c:237
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17124,7 +15056,7 @@ msgstr ""
 "\n"
 "Esperamos que disfrute de nuestro duro trabajo y esperamos su contribución.\n"
 
-#: shell/main.c:250
+#: shell/main.c:261
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17132,42 +15064,50 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: shell/main.c:257
+#: shell/main.c:268
 msgid "Don't tell me again"
 msgstr "No preguntarme más veces"
 
-#: shell/main.c:462
+#: shell/main.c:473
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: shell/main.c:464
+#: shell/main.c:475
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
-#: shell/main.c:466
+#: shell/main.c:477
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: shell/main.c:469
-msgid "Forcibly shut down all evolution components"
+#: shell/main.c:480
+msgid "Forcibly shut down all Evolution components"
 msgstr "Forzar el cierre de todos los componentes de Evolution"
 
-#: shell/main.c:473
+#: shell/main.c:484
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Fuerza la re-emigración desde Evolution 1.4"
 
-#: shell/main.c:476
+#: shell/main.c:487
 msgid "Send the debugging output of all components to a file."
-msgstr "Envía la salida de depurado de todos los componente a un archivo."
+msgstr "Envía la salida de depuración de todos los componentes a un archivo."
 
-#: shell/main.c:507
+#: shell/main.c:490
+msgid "Disable the mono plugin environment."
+msgstr "Desactiva el entorno de complementos de mono."
+
+#: shell/main.c:493
+msgid "Disable loading of any plugins."
+msgstr "Desactiva la carga de cualquier complemento."
+
+#: shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 "%s: --online y --offline no pueden usarse a la vez.\n"
-"  use %s --help para más información\n"
+"  Use %s --help para más información\n"
 
 #. shell:upgrade-nospace primary
 #: shell/shell-errors.xml.h:2
@@ -17323,26 +15263,6 @@ msgstr ""
 "\n"
 "Edite la configuración de confianza:"
 
-#: smime/gui/cert-trust-dialog.c:145
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Debido a que usted confía en la autoridad de certificación que emitió este "
-"certificado, entonces confía en la autenticidad de este certificado a no ser "
-"que se indique otra cosa aquí"
-
-#: smime/gui/cert-trust-dialog.c:149
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Debido a que usted no confía en la autoridad de certificación que emitió "
-"este certificado, entonces usted no confía en la autenticidad de este "
-"certificado a no ser que se indique otra cosa aquí"
-
 #: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
 #: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
 #: smime/gui/certificate-manager.c:595 smime/gui/certificate-manager.c:603
@@ -17376,6 +15296,26 @@ msgstr "Dirección de correo-e"
 msgid "Certificate Viewer: %s"
 msgstr "Visor de certificados: %s"
 
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"Debido a que usted confía en la autoridad de certificación que emitió este "
+"certificado, entonces confía en la autenticidad de este certificado a no ser "
+"que se indique otra cosa aquí"
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"Debido a que usted no confía en la autoridad de certificación que emitió "
+"este certificado, entonces usted no confía en la autenticidad de este "
+"certificado a no ser que se indique otra cosa aquí"
+
 #: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
@@ -17391,7 +15331,7 @@ msgid "Enter new password"
 msgstr "Introduzca la contraseña nueva"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:121
+#: smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -17400,7 +15340,7 @@ msgstr ""
 "Emitido a:\n"
 "  Asunto: %s\n"
 
-#: smime/gui/e-cert-selector.c:122
+#: smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -17409,7 +15349,7 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: smime/gui/e-cert-selector.c:169
+#: smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Seleccione el certificado"
 
@@ -17570,8 +15510,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
 #: smime/gui/smime-ui.glade.h:43
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Tiene archivados los certificados que identifican a estas autoridades de "
 "certificación:"
@@ -17588,10 +15527,9 @@ msgstr "Sus certificados"
 msgid "_Edit CA Trust"
 msgstr "_Editar confianza en la AC"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "El certificado ya existe"
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "diálogo1"
 
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
@@ -17792,15 +15730,20 @@ msgstr "ID único del propósito"
 msgid "Certificate Signature Value"
 msgstr "Valor de la firma del certificado"
 
-#: smime/lib/e-pkcs12.c:263
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "El certificado ya existe"
+
+#: smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "Contraseña para el archivo PKCS12"
 
-#: smime/lib/e-pkcs12.c:263
+#: smime/lib/e-pkcs12.c:264
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduzca contraseña para el archivo PKCS12:"
 
-#: smime/lib/e-pkcs12.c:362
+#: smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
@@ -17878,8 +15821,7 @@ msgid "Previews the contacts to be printed"
 msgstr "Previsualiza los contactos a imprimir"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
-#: ui/evolution-tasks.xml.h:15
+#: ui/evolution-mail-message.xml.h:81 ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Pre_visualizar la impresión"
 
@@ -17928,16 +15870,14 @@ msgid "View the current contact"
 msgstr "Ver el contacto actual"
 
 #: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
+#: ui/evolution-mail-global.xml.h:15 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:19
+#: ui/evolution.xml.h:36
 msgid "_Actions"
 msgstr "A_cciones"
 
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Reenviar contacto..."
 
@@ -18061,11 +16001,6 @@ msgstr "Mostrar una semana"
 msgid "Show the working week"
 msgstr "Mostrar la semana laboral"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
-#: widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "Hoy"
-
 #: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Ver la cita actual"
@@ -18082,76 +16017,6 @@ msgstr "Semana laboral"
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Cerrar"
-
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
-msgid "Close"
-msgstr "Cerrar"
-
-#: ui/evolution-comp-editor.xml.h:3
-msgid "Close this item"
-msgstr "Cerrar este elemento"
-
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
-msgid "Delete this item"
-msgstr "Borrar este elemento"
-
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr "Barra de herramientas principal"
-
-#: ui/evolution-comp-editor.xml.h:7
-msgid "Preview the printed item"
-msgstr "Previsualiza el elemento que va a ser impreso"
-
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
-msgid "Print this item"
-msgstr "Imprime este elemento"
-
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Guardar _como..."
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
-msgid "Save and Close"
-msgstr "Guardar y cerrar"
-
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-msgid "Save and _Close"
-msgstr "Guardar y _cerrar"
-
-#: ui/evolution-comp-editor.xml.h:14
-msgid "Save the item and close the dialog box"
-msgstr "Guarda el elemento y cierra la ventana de diálogo"
-
-#: ui/evolution-comp-editor.xml.h:15
-msgid "Save this item to disk"
-msgstr "Guarda este elemento a disco"
-
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:29
-msgid "_File"
-msgstr "_Archivo"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Copia el texto seleccionado al portapapeles"
@@ -18177,81 +16042,6 @@ msgstr "_Seleccionar todo"
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
 
-#: ui/evolution-contact-editor.xml.h:6
-msgid "Print En_velope..."
-msgstr "Imprimir so_bre..."
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Save the contact and close the dialog box"
-msgstr "Guarda el contacto y cierra la ventana de diálogo"
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "Send _Message to Contact..."
-msgstr "Enviar un _mensaje al contacto..."
-
-#: ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Guardar"
-
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete this list"
-msgstr "Borra esta lista"
-
-#: ui/evolution-contact-list-editor.xml.h:8
-msgid "Save the list and close the dialog box"
-msgstr "Guarda la lista y cierra la ventana de diálogo"
-
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Se_nd list to other..."
-msgstr "E_nviar la lista a otros..."
-
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Send _message to list..."
-msgstr "Enviar un _mensaje a la lista..."
-
-#: ui/evolution-contact-list-editor.xml.h:12
-msgid "_Delete..."
-msgstr "_Borrar..."
-
-#: ui/evolution-event-editor.xml.h:1
-msgid "Cancel Mee_ting"
-msgstr "Cancelar reun_ión"
-
-#: ui/evolution-event-editor.xml.h:2
-msgid "Cancel the meeting for this item"
-msgstr "Cancela la reunión para este elemento"
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-msgid "Forward as i_Calendar"
-msgstr "Reenviar como i_Calendar"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
-msgid "Forward this item via email"
-msgstr "Reenvía este elemento por correo"
-
-#: ui/evolution-event-editor.xml.h:6
-msgid "Meeting"
-msgstr "Reunión"
-
-#: ui/evolution-event-editor.xml.h:7
-msgid "Obtain the latest meeting information"
-msgstr "Obtiene la última información de la reunión"
-
-#: ui/evolution-event-editor.xml.h:8
-msgid "Re_fresh Meeting"
-msgstr "Actuali_zar reunión"
-
-#: ui/evolution-event-editor.xml.h:9
-msgid "Schedule _Meeting"
-msgstr "Concertar una _reunión"
-
-#: ui/evolution-event-editor.xml.h:10
-msgid "Schedule a meeting for this item"
-msgstr "Concierta una reunión para este elemento"
-
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Personaliza Mi Evolution"
@@ -18282,8 +16072,7 @@ msgstr "Abre una ventana para escribir un mensaje de correo"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
@@ -18342,10 +16131,8 @@ msgid "Hide _Read Messages"
 msgstr "Oculta_r mensajes leídos"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+msgid "Hide deleted messages rather than displaying them with a line through them"
+msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
@@ -18413,6 +16200,33 @@ msgstr "_Invertir selección"
 msgid "_Threaded Message List"
 msgstr "_Lista de mensajes por conversaciones"
 
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Cerrar"
+
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
+
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
+msgid "Main toolbar"
+msgstr "Barra de herramientas principal"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:37
+msgid "_Close"
+msgstr "_Cerrar"
+
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:39
+msgid "_File"
+msgstr "_Archivo"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "_Añadir remitente a la libreta de direcciones"
@@ -18805,7 +16619,7 @@ msgstr "Mensaje a_nterior"
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:48
 msgid "_Tools"
 msgstr "_Herramientas"
 
@@ -18813,16 +16627,6 @@ msgstr "_Herramientas"
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Cerrar"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Adjuntar"
@@ -18875,15 +16679,14 @@ msgstr "Cifrar con S/MIME"
 msgid "S/MIME Sign"
 msgstr "Firmar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Guardar"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Guardar como"
 
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Guardar _como..."
+
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Guardar _borrador"
@@ -18995,6 +16798,11 @@ msgstr "Campo «_Publicar-en»"
 msgid "_Reply-To Field"
 msgstr "Campo «_Responder-a»"
 
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Guardar"
+
 #: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Seguridad"
@@ -19003,10 +16811,22 @@ msgstr "_Seguridad"
 msgid "_To Field"
 msgstr "Campo «_Para»"
 
+#: ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Cerrar"
+
 #: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
+#: ui/evolution-signature-editor.xml.h:7
+msgid "Save and Close"
+msgstr "Guardar y cerrar"
+
+#: ui/evolution-signature-editor.xml.h:8
+msgid "Save and _Close"
+msgstr "Guardar y _cerrar"
+
 #: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Guardar el archivo y cerrar la ventana de diálogo"
@@ -19039,30 +16859,6 @@ msgstr "Suscribir"
 msgid "Unsubscribe"
 msgstr "Dar de baja"
 
-#: ui/evolution-task-editor.xml.h:1
-msgid "Assign Task"
-msgstr "Asignar tarea"
-
-#: ui/evolution-task-editor.xml.h:2
-msgid "Assign this task to others"
-msgstr "Asignar esta tarea a otros"
-
-#: ui/evolution-task-editor.xml.h:3
-msgid "Cancel Task"
-msgstr "Cancelar tarea"
-
-#: ui/evolution-task-editor.xml.h:4
-msgid "Cancel this task"
-msgstr "Cancelar esta tarea"
-
-#: ui/evolution-task-editor.xml.h:7
-msgid "Obtain the latest task information"
-msgstr "Obtener la última información de la tarea"
-
-#: ui/evolution-task-editor.xml.h:8
-msgid "Re_fresh Task"
-msgstr "Ac_tualizar tarea"
-
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Copia las tareas seleccionadas"
@@ -19124,98 +16920,146 @@ msgid "Create a new window displaying this folder"
 msgstr "Crear una nueva ventana mostrando esta carpeta"
 
 #: ui/evolution.xml.h:7
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "Mostrar los botones de la ventana usando la configuración de la barra de herramientas del escritorio"
+
+#: ui/evolution.xml.h:8
+msgid "Display window buttons with icons and text"
+msgstr "Mostrar los botones de la ventana con iconos y texto"
+
+#: ui/evolution.xml.h:9
+msgid "Display window buttons with icons only"
+msgstr "Mostrar los botones de la ventana sólo con iconos"
+
+#: ui/evolution.xml.h:10
+msgid "Display window buttons with text only"
+msgstr "Mostrar los botones de la ventana sólo con texto"
+
+#: ui/evolution.xml.h:11
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:12
 msgid "Evolution _FAQ"
 msgstr "P+_F de Evolution"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:13
 msgid "Exit the program"
 msgstr "Sale del programa"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:14
 msgid "Forget _Passwords"
 msgstr "O_lvidar contraseñas"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:15
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Olvida las contraseñas almacenadas así que se le preguntarán de nuevo"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:16
+msgid "Hide window buttons"
+msgstr "Ocultar los botones de la ventana"
+
+#: ui/evolution.xml.h:17
+msgid "Icons _and text"
+msgstr "Iconos _y texto"
+
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Importar datos de otros programas"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:20
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:21
 msgid "Pi_lot Settings..."
 msgstr "Configuración del _Pilot..."
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:22
+msgid "Prefere_nces"
+msgstr "_Preferencias"
+
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr "Envía el correo en la cola y obtiene el nuevo"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:25
 msgid "Set up Pilot configuration"
 msgstr "Configuración del Pilot"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Muestra información acerca de Evolution"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Envía un informe de fallos"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Enviar informe de _fallos"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de fallos usando Bug Buddy"
 
-#: ui/evolution.xml.h:23
-msgid "T_oolbar"
-msgstr "Barra de _herramientas"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Conmutador que indica si se está trabajando desconectado o no."
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
+msgid "Tool_bar"
+msgstr "Barra de _herramientas"
+
+#: ui/evolution.xml.h:32
+msgid "Tool_bar style"
+msgstr "_Estilo de la barra de herramientas"
+
+#: ui/evolution.xml.h:33
+msgid "Window B_uttons"
+msgstr "Botones de la _ventana"
+
+#: ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "A_cerca de Evolution..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "A_yuda"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:41
+msgid "_Hide buttons"
+msgstr "_Ocultar botones"
+
+#: ui/evolution.xml.h:42
+msgid "_Icons only"
+msgstr "Sólo _iconos"
+
+#: ui/evolution.xml.h:43
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:45
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:46
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:47
+msgid "_Text only"
+msgstr "Sólo _texto"
+
+#: ui/evolution.xml.h:50
 msgid "_Window"
 msgstr "_Ventana"
 
@@ -19283,8 +17127,8 @@ msgstr "Con fecha de _vencimiento"
 msgid "With _Status"
 msgstr "Con _estado"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr "UTC"
 
@@ -19296,11 +17140,15 @@ msgstr "<b>Zonas horarias</b>"
 msgid "<b>_Selection</b>"
 msgstr "<b>_Selección</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Seleccione una zona horaria"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+msgid "TimeZone Combobox"
+msgstr "Caja combo para la zona horaria "
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -19314,40 +17162,39 @@ msgstr ""
 msgid "_Current View"
 msgstr "_Vista actual"
 
-#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:351
-msgid "Custom View"
-msgstr "Vista personalizada"
-
 #: widgets/menus/gal-view-menus.c:360
 msgid "Save Custom View..."
 msgstr "Guardar vista personalizada..."
 
-#: widgets/menus/gal-view-menus.c:373
-msgid "Define Views..."
-msgstr "Definir vistas..."
+#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
+msgid "Previous Button"
+msgstr "Botón anterior"
+
+#: widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "Calendario mensual"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:423
+#: widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "LMXJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1128
+#: widgets/misc/e-calendar-item.c:1123
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
 msgid "Now"
 msgstr "Ahora"
 
-#: widgets/misc/e-cell-date-edit.c:805
+#: widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La fecha debe estar en el formato: %s"
 
-#: widgets/misc/e-cell-percent.c:77
+#: widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100, inclusive"
 
@@ -19438,29 +17285,56 @@ msgstr "Otro..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:83 widgets/misc/e-error.c:84
-#: widgets/misc/e-error.c:126
+#: widgets/misc/e-dateedit.c:313
+msgid "Date and Time Entry"
+msgstr "Entrada para la fecha y hora"
+
+#: widgets/misc/e-dateedit.c:332
+msgid "Text entry to input date"
+msgstr "Entrada de texto para introducir la fecha"
+
+#: widgets/misc/e-dateedit.c:333
+msgid "Text Date Entry"
+msgstr "Entrada de texto para la fecha "
+
+#: widgets/misc/e-dateedit.c:350
+msgid "Click this button to show a calendar"
+msgstr "Pulse este botón para mostrar un calendario"
+
+#: widgets/misc/e-dateedit.c:351
+msgid "Date Button"
+msgstr "Botón de fecha"
+
+#: widgets/misc/e-dateedit.c:371
+msgid "Combo box to select time"
+msgstr "Caja combo para seleccionar la hora"
+
+#: widgets/misc/e-dateedit.c:372
+msgid "Time Combo Box"
+msgstr "Caja combo de la hora"
+
+#: widgets/misc/e-error.c:84 widgets/misc/e-error.c:85
+#: widgets/misc/e-error.c:127
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: widgets/misc/e-error.c:85 widgets/misc/e-error.c:86
-#: widgets/misc/e-error.c:124
+#: widgets/misc/e-error.c:86 widgets/misc/e-error.c:87
+#: widgets/misc/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Advertencia de Evolution"
 
-#: widgets/misc/e-error.c:123
+#: widgets/misc/e-error.c:124
 msgid "Evolution Information"
 msgstr "Información de Evolution"
 
-#: widgets/misc/e-error.c:125
+#: widgets/misc/e-error.c:126
 msgid "Evolution Query"
 msgstr "Consulta de Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:421
+#: widgets/misc/e-error.c:436
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr ""
 "<span weight=\"bold\">Error interno, solicitado un error desconocido «%s»</"
 "span>"
@@ -19550,6 +17424,16 @@ msgstr "_Avanzado..."
 msgid "Choose Image"
 msgstr "Elija una imagen"
 
+#: widgets/misc/e-map.c:647
+msgid "World Map"
+msgstr "Mapa mundial"
+
+#: widgets/misc/e-map.c:649
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should select the timezone from the below combo box instead."
+msgstr "Widget con mapa interactivo con ratón para seleccionar la zona horaria. Los usuarios que sólo dispongan de teclado deberían seleccionar la zona horaria desde la caja combo de abajo en su lugar."
+
 #: widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Sincronizar con:"
@@ -19562,31 +17446,37 @@ msgstr "Sincr. de registros privados:"
 msgid "Sync Categories:"
 msgstr "Sincr. de categorías:"
 
-#: widgets/misc/e-search-bar.c:540
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: widgets/misc/e-search-bar.c:343
+msgid "Search Text Entry"
+msgstr "Entrada de búsqueda de texto"
+
+#: widgets/misc/e-search-bar.c:547
 msgid "_Search"
 msgstr "_Buscar"
 
-#: widgets/misc/e-search-bar.c:546
+#: widgets/misc/e-search-bar.c:553
 msgid "_Find Now"
 msgstr "_Buscar ahora"
 
-#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:554 widgets/misc/e-search-bar.c:936
 msgid "_Clear"
 msgstr "_Vaciar"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:844
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: widgets/misc/e-search-bar.c:844
+#: widgets/misc/e-search-bar.c:851
 msgid "Subitem ID"
 msgstr "ID de subelemento"
 
-#: widgets/misc/e-search-bar.c:851
+#: widgets/misc/e-search-bar.c:858
 msgid "Text"
 msgstr "Texto"
 
-#: widgets/misc/e-search-bar.c:931
+#: widgets/misc/e-search-bar.c:938
 msgid "Find _Now"
 msgstr "Buscar _ahora"
 
@@ -19610,16 +17500,2436 @@ msgstr "No se pudo guardar el archivo {0}."
 msgid "Cannot open file \"{0}\"."
 msgstr "No se pudo abrir el archivo «{0}»."
 
-#: widgets/misc/e-task-widget.c:212
+#: widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:217
+#: widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
+#~ msgid "contact's header: "
+#~ msgstr "cabecera del contacto: "
+
+#~ msgid ""
+#~ "Address book '%s' will be removed. Are you sure you want to continue?"
+#~ msgstr "La libreta «%s» será eliminada. ¿Seguro que quiere continuar?"
+
+#~ msgid "Evolution Addressbook name selection interface"
+#~ msgstr ""
+#~ "Interfaz de selección de nombre de la libreta de direcciones de Evolution"
+
+#~ msgid "Remove All"
+#~ msgstr "Eliminar todo"
+
+#~ msgid "View Contact List"
+#~ msgstr "Ver lista de contactos"
+
+#~ msgid "View Contact Info"
+#~ msgstr "Ver información del contacto"
+
+#~ msgid "Send HTML Mail?"
+#~ msgstr "¿Enviar correo en HTML?"
+
+#~ msgid "Unnamed Contact"
+#~ msgstr "Contacto anónimo"
+
+#~ msgid "Select Contacts from Address Book"
+#~ msgstr "Selecciona contactos de la libreta de direcciones"
+
+#~ msgid "<b>Contacts</b>"
+#~ msgstr "<b>Contactos</b>"
+
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>Mostrar contactos</b>"
+
+#~ msgid "Address _Book:"
+#~ msgstr "_Libreta de direcciones:"
+
+#~ msgid "C_ategory:"
+#~ msgstr "_Categoría:"
+
+#~ msgid "_Find"
+#~ msgstr "_Buscar"
+
+#~ msgid "_Search:"
+#~ msgstr "_Buscar:"
+
+#~ msgid "Address:"
+#~ msgstr "Dirección:"
+
+#~ msgid "PO Box:"
+#~ msgstr "Apdo. de correos:"
+
+#~ msgid "State/Province:"
+#~ msgstr "Estado/Provincia:"
+
+#~ msgid "Title:"
+#~ msgstr "Tratamiento:"
+
+#~ msgid "Go to Folder..."
+#~ msgstr "Ir a la carpeta..."
+
+#~ msgid "Import..."
+#~ msgstr "Importar..."
+
+#~ msgid "Address Book Sources..."
+#~ msgstr "Fuentes de la libreta de direcciones..."
+
+#~ msgid "Print Envelope"
+#~ msgstr "Imprimir sobre"
+
+#~ msgid "Reflow Test"
+#~ msgstr "Test de reflujo"
+
+#~ msgid "This should test the reflow canvas item"
+#~ msgstr "Esto debería probar el reflujo del elemento lienzo"
+
+#~ msgid "Evolution VCard importer"
+#~ msgstr "Importador de VCard de Evolution"
+
+#~ msgid "Unnamed List"
+#~ msgstr "Lista de anónimos"
+
+#~ msgid "Starting:"
+#~ msgstr "Inicio:"
+
+#~ msgid "Ending:"
+#~ msgstr "Finalización:"
+
+#~ msgid "Evolution Alarm"
+#~ msgstr "Alarma de Evolution"
+
+#~ msgid "Alarm on %s"
+#~ msgstr "Alarmas en %s"
+
+#~ msgid "_Edit appointment"
+#~ msgstr "_Editar cita"
+
+#~ msgid "%A %d %B %Y"
+#~ msgstr "%A, %d de %B de %Y"
+
+#~ msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
+#~ msgstr "El calendario «%s» será eliminado. ¿Seguro que quiere continuar?"
+
+#~ msgid "backend_go_offline(): %s"
+#~ msgstr "backend_go_offline(): %s"
+
+#~ msgid "backend_go_online(): %s"
+#~ msgstr "backend_go_online(): %s"
+
+#~ msgid "open_client(): %s"
+#~ msgstr "open_client(): %s"
+
+#~ msgid "You must specify a location to get the calendar from."
+#~ msgstr "Debe especificar una ubicación de la que obtener el calendario."
+
+#~ msgid "The source location '%s' is not well-formed."
+#~ msgstr "La ubicación fuente «%s» no está bien formada."
+
+#~ msgid "The source location '%s' is not a webcal source."
+#~ msgstr "La ubicación fuente «%s» no es una fuente webcal."
+
+#~ msgid "Source with name '%s' already exists in the selected group"
+#~ msgstr "El origen con nombre «%s» ya existe en el grupo seleccionado"
+
+#~ msgid ""
+#~ "The group '%s' is remote. You must specify a location to get the calendar "
+#~ "from"
+#~ msgstr ""
+#~ "El grupo «%s» es remoto. Debe especificar una ubicación de la que obtener "
+#~ "el calendario"
+
+#~ msgid "_Destination"
+#~ msgstr "_Destino"
+
+#~ msgid "Free/Busy Editor"
+#~ msgstr "Editor de información de disponibilidad"
+
+#~ msgid "_Go to Date..."
+#~ msgstr "_Ir a una fecha..."
+
+#~ msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+#~ msgstr ""
+#~ "La lista de tareas «%s» será eliminada. ¿Seguro que quiere continuar?"
+
+#~ msgid "Signing is not supported by this cipher"
+#~ msgstr "Este método de cifrado no soporta firmas"
+
+#~ msgid "Signing message"
+#~ msgstr "Firmando mensaje"
+
+#~ msgid "Verifying is not supported by this cipher"
+#~ msgstr "Este método de cifrado no soporta verificación"
+
+#~ msgid "Verifying message"
+#~ msgstr "Verificando mensaje"
+
+#~ msgid "Encryption is not supported by this cipher"
+#~ msgstr "Este método de cifrado no soporta cifrado"
+
+#~ msgid "Encrypting message"
+#~ msgstr "Encriptando mensaje"
+
+#~ msgid "Decryption is not supported by this cipher"
+#~ msgstr "El descifrado no está soportado por este método de cifrado"
+
+#~ msgid "Decrypting message"
+#~ msgstr "Desencriptando mensaje"
+
+#~ msgid "You may not import keys with this cipher"
+#~ msgstr "No puede importar claves con este método de cifrado"
+
+#~ msgid "You may not export keys with this cipher"
+#~ msgstr "No puede exportar claves con este método de cifrado"
+
+#~ msgid "Unable to create cache path"
+#~ msgstr "No se pudo crear la ruta a la caché"
+
+#~ msgid "Could not remove cache entry: %s: %s"
+#~ msgstr "No se pudo quitar la entrada de caché: %s: %s"
+
+#~ msgid ""
+#~ "Could not write log entry: %s\n"
+#~ "Further operations on this server will not be replayed when you\n"
+#~ "reconnect to the network."
+#~ msgstr ""
+#~ "No se pudo escribir una entrada del archivo de actividad: %s\n"
+#~ "Las siguientes operaciones en este servidor no serán registradas\n"
+#~ "cuando se reconecte a la red."
+
+#~ msgid ""
+#~ "Could not open `%s':\n"
+#~ "%s\n"
+#~ "Changes made to this folder will not be resynchronized."
+#~ msgstr ""
+#~ "No se pudo abrir «%s»:\n"
+#~ "%s\n"
+#~ "Los cambios hechos a esta carpeta no serán resincronizados."
+
+#~ msgid "Resynchronizing with server"
+#~ msgstr "Resincronizando con el servidor"
+
+#~ msgid "Downloading new messages for offline mode"
+#~ msgstr "Descargando mensajes nuevos para modo desconectado"
+
+#~ msgid "Preparing folder '%s' for offline"
+#~ msgstr "Preparando carpeta «%s» para desconexión"
+
+#~ msgid "You must be working online to complete this operation"
+#~ msgstr ""
+#~ "Para completar esta operación debe estar trabajando conectado a la red"
+
+#~ msgid "Failed to create pipe to '%s': %s"
+#~ msgstr "Falló al crear pipe a «%s»: %s"
+
+#~ msgid "Failed to create child process '%s': %s"
+#~ msgstr "Error al crear proceso hijo «%s»: %s"
+
+#~ msgid "Invalid message stream received from %s: %s"
+#~ msgstr "Flujo de mensaje inválido recibido desde %s: %s"
+
+#~ msgid "Syncing folders"
+#~ msgstr "Sincronizando carpetas"
+
+#~ msgid "Error parsing filter: %s: %s"
+#~ msgstr "Error analizando filtro: %s: %s"
+
+#~ msgid "Error executing filter: %s: %s"
+#~ msgstr "Error ejecutando filtro: %s: %s"
+
+#~ msgid "Unable to open spool folder"
+#~ msgstr "No se pudo abrir la carpeta temporal"
+
+#~ msgid "Unable to process spool folder"
+#~ msgstr "No se pudo procesar la carpeta temporal"
+
+#~ msgid "Getting message %d (%d%%)"
+#~ msgstr "Obteniendo mensaje %d (%d%%)"
+
+#~ msgid "Cannot open message"
+#~ msgstr "No se pudo abrir el mensaje"
+
+#~ msgid "Failed on message %d"
+#~ msgstr "Error en el mensaje %d"
+
+#~ msgid "Syncing folder"
+#~ msgstr "Sincronizando carpeta"
+
+#~ msgid "Getting message %d of %d"
+#~ msgstr "Obteniendo mensaje %d de %d"
+
+#~ msgid "Failed at message %d of %d"
+#~ msgstr "Falló en el mensaje %d de %d"
+
+#~ msgid "Failed to retrieve message"
+#~ msgstr "Falló al obtener el mensaje"
+
+#~ msgid "Invalid arguments to (system-flag)"
+#~ msgstr "Argumentos inválidos a (system-flag)"
+
+#~ msgid "Invalid arguments to (user-tag)"
+#~ msgstr "Argumentos inválidos a (user-tag)"
+
+#~ msgid "Failed to create create child process '%s': %s"
+#~ msgstr "Error al crear proceso hijo «%s»: %s"
+
+#~ msgid "Error executing filter search: %s: %s"
+#~ msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
+
+#~ msgid ""
+#~ "Cannot parse search expression: %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo analizar la expresión de búsqueda: %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error executing search expression: %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error ejecutando la búsqueda según la expresión: %s:\n"
+#~ "%s"
+
+#~ msgid "(match-all) requires a single bool result"
+#~ msgstr "(coincidir con todas) requiere un único resultado booleano"
+
+#~ msgid "(match-threads) not allowed inside match-all"
+#~ msgstr "(coincidir-conversaciones) no se permite dentro de «coincidir-todo»"
+
+#~ msgid "(match-threads) requires a match type string"
+#~ msgstr "(coincidir-conversaciones) requiere una cadena de coincidencia"
+
+#~ msgid "(match-threads) expects an array result"
+#~ msgstr "(coincidir-conversaciones) espera un resultado array"
+
+#~ msgid "(match-threads) requires the folder set"
+#~ msgstr "(coincidir-conversaciones) requiere que se establezca una carpeta"
+
+#~ msgid "Performing query on unknown header: %s"
+#~ msgstr "Realizando búsqueda en cabecera desconocida: %s"
+
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "Operación no implementada: añadir mensaje: para %s"
+
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "Operación no implementada: búsqueda según la expresión: para %s"
+
+#~ msgid "Unsupported operation: search by uids: for %s"
+#~ msgstr "Operación no implementada: búsqueda por uids: para %s"
+
+#~ msgid "Moving messages"
+#~ msgstr "Moviendo mensajes"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copiando mensajes"
+
+#~ msgid "Learning junk"
+#~ msgstr "Aprendiendo spam"
+
+#~ msgid "Learning non-junk"
+#~ msgstr "Aprendiendo no-spam"
+
+#~ msgid "Filtering new message(s)"
+#~ msgstr "Filtrando mensajes(s) nuevo(s)"
+
+#~ msgid ""
+#~ "Unexpected GnuPG status message encountered:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Se encontró un mensaje de estado GNUPG inesperado:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to parse gpg userid hint."
+#~ msgstr "Falló al analizar el id del usuario gpg."
+
+#~ msgid "Failed to parse gpg passphrase request."
+#~ msgstr "Falló al analizar la solicitud de contraseña gpg."
+
+#~ msgid ""
+#~ "You need a passphrase to unlock the key for\n"
+#~ "user: \"%s\""
+#~ msgstr ""
+#~ "Necesita una contraseña para desbloquear la clave para \n"
+#~ "el usuario: «%s»"
+
+#~ msgid "Failed to unlock secret key: 3 bad passphrases given."
+#~ msgstr ""
+#~ "Falló al desbloquear la clave secreta: se dieron 3 contraseñas falsas."
+
+#~ msgid "Unexpected response from GnuPG: %s"
+#~ msgstr "Respuesta inesperada del GNUPG: %s"
+
+#~ msgid "Failed to encrypt: No valid recipients specified."
+#~ msgstr "No se pudo cifrar este mensaje: no hay destinatarios."
+
+#~ msgid ""
+#~ "Failed to GPG %s: %s\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fallo en GPG %s mensaje: %s\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to GPG %s: %s\n"
+#~ msgstr "Error con GPG %s: %s\n"
+
+#~ msgid "Could not generate signing data: %s"
+#~ msgstr "No se pudo generar los datos de la firma: %s"
+
+#~ msgid "Failed to execute gpg: %s"
+#~ msgstr "Error al ejecutar gpg: %s"
+
+#~ msgid "Failed to execute gpg."
+#~ msgstr "Falló al ejecutar gpg."
+
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "Esta parte del mensaje está firmada digitalmente"
+
+#~ msgid "Cannot verify message signature: Incorrect message format"
+#~ msgstr ""
+#~ "No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
+
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "No se pudo verificar la firma del mensaje: no pude crear un archivo "
+#~ "temporal: %s"
+
+#~ msgid "Could not generate encrypting data: %s"
+#~ msgstr "No se pudo generar los datos de cifrado: %s"
+
+#~ msgid "This is a digitally encrypted message part"
+#~ msgstr "Esta parte del mensaje está cifrada digitalmente"
+
+#~ msgid "Encrypted content"
+#~ msgstr "Contenido cifrado"
+
+#~ msgid "Cannot build locking helper pipe: %s"
+#~ msgstr "No se pudo crear un conducto(pipe) para la ayuda: %s"
+
+#~ msgid "Cannot fork locking helper: %s"
+#~ msgstr "No se pudo hacer un bifurcar del ayudante de bloqueo: %s"
+
+#~ msgid "Could not lock '%s': protocol error with lock-helper"
+#~ msgstr "No se pudo bloquear «%s»: error del protocolo con lock-helper"
+
+#~ msgid "Could not lock '%s'"
+#~ msgstr "No se pudo bloquear «%s»"
+
+#~ msgid "Could not create lock file for %s: %s"
+#~ msgstr "No se pudo bloquear el archivo para %s: %s"
+
+#~ msgid "Timed out trying to get lock file on %s. Try again later."
+#~ msgstr ""
+#~ "Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
+
+#~ msgid "Failed to get lock using fcntl(2): %s"
+#~ msgstr "Fallo al hacer un bloqueo usando fcntl(2): %s"
+
+#~ msgid "Failed to get lock using flock(2): %s"
+#~ msgstr "Fallo al hacer un bloqueo usando flock(2): %s"
+
+#~ msgid "Could not check mail file %s: %s"
+#~ msgstr "No se pudo comprobar el archivo de correo %s: %s"
+
+#~ msgid "Could not open mail file %s: %s"
+#~ msgstr "No se pudo abrir el archivo de correo %s: %s"
+
+#~ msgid "Could not open temporary mail file %s: %s"
+#~ msgstr "No se pudo abrir el archivo de correo temporal %s: %s"
+
+#~ msgid "Failed to store mail in temp file %s: %s"
+#~ msgstr "Falló al guardar el correo en al archivo temporal %s: %s"
+
+#~ msgid "Could not create pipe: %s"
+#~ msgstr "No se pudo crear un pipe: %s"
+
+#~ msgid "Could not fork: %s"
+#~ msgstr "No se pudo bifurcar: %s"
+
+#~ msgid "Movemail program failed: %s"
+#~ msgstr "El programa Movemail ha fallado: %s"
+
+#~ msgid "(Unknown error)"
+#~ msgstr "(Error desconocido)"
+
+#~ msgid "Error reading mail file: %s"
+#~ msgstr "Error leyendo el archivo de correo: %s"
+
+#~ msgid "Error writing mail temp file: %s"
+#~ msgstr "Error escribiendo en el archivo temporal de correo: %s"
+
+#~ msgid "Error copying mail temp file: %s"
+#~ msgstr "Error copiando el correo al archivo temporal: %s"
+
+#~ msgid "Failed to decrypt MIME part: protocol error"
+#~ msgstr "Falló al descifrar la parte MIME: error del protocolo"
+
+#~ msgid "Failed to decrypt MIME part: invalid structure"
+#~ msgstr "Falló al descifrar la parte MIME: estructura inválida"
+
+#~ msgid "parse error"
+#~ msgstr "error de análisis"
+
+#~ msgid "Virtual folder email provider"
+#~ msgstr "Proveedor de correo de la carpeta virtual"
+
+#~ msgid "For reading mail as a query of another set of folders"
+#~ msgstr "Para leer correo como una búsqueda de otras carpetas"
+
+#~ msgid "Could not load %s: Module loading not supported on this system."
+#~ msgstr ""
+#~ "No se pudo cargar %s: La carga de módulos no está implementada es este "
+#~ "sistema."
+
+#~ msgid "Could not load %s: %s"
+#~ msgstr "No se pudo cargar %s: %s"
+
+#~ msgid "Could not load %s: No initialization code in module."
+#~ msgstr "No se pudo cagar %s: No hay código de inicialización en el módulo."
+
+#~ msgid "No provider available for protocol `%s'"
+#~ msgstr "No hay proveedor para el protocolo «%s»"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anónimo"
+
+#~ msgid "This option will connect to the server using an anonymous login."
+#~ msgstr "Esta opción conectará con el servidor usando un usuario anónimo."
+
+#~ msgid "Authentication failed."
+#~ msgstr "Falló en la autenticación."
+
+#~ msgid ""
+#~ "Invalid email address trace information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Dirección de correo errónea información de ayuda:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Invalid opaque trace information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Información opaca de seguimiento inválida:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Invalid trace information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Información de seguimiento inválida:\n"
+#~ "%s"
+
+#~ msgid "CRAM-MD5"
+#~ msgstr "CRAM-MD5"
+
+#~ msgid ""
+#~ "This option will connect to the server using a secure CRAM-MD5 password, "
+#~ "if the server supports it."
+#~ msgstr ""
+#~ "Esta opción conectará con el servidor usando una clave segura CRAM-MD5, "
+#~ "si el servidor lo implementa."
+
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
+
+#~ msgid ""
+#~ "This option will connect to the server using a secure DIGEST-MD5 "
+#~ "password, if the server supports it."
+#~ msgstr ""
+#~ "Esta opción conectará con el servidor usando una clave segura DIGEST-MD5, "
+#~ "si el servidor lo implementa."
+
+#~ msgid "Server challenge too long (>2048 octets)\n"
+#~ msgstr "Reto del servidor demasiado largo (>2048 octetos)\n"
+
+#~ msgid "Server challenge invalid\n"
+#~ msgstr "Reto del servidor no válido\n"
+
+#~ msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+#~ msgstr ""
+#~ "El reto del servidor contiene una valor «Calidad de Protección» no "
+#~ "válido\n"
+
+#~ msgid "Server response did not contain authorization data\n"
+#~ msgstr "La respuesta del servidor no contenía información de autorización\n"
+
+#~ msgid "Server response contained incomplete authorization data\n"
+#~ msgstr ""
+#~ "La respuesta del servidor contenía información de autorización "
+#~ "incompleta\n"
+
+#~ msgid "Server response does not match\n"
+#~ msgstr "La respuesta del servidor no coincide\n"
+
+#~ msgid "GSSAPI"
+#~ msgstr "GSSAPI"
+
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 5 authentication."
+#~ msgstr ""
+#~ "Esta opción conectará con el servidor usando autenticación Kerberos 5."
+
+#~ msgid ""
+#~ "The specified mechanism is not supported by the provided credential, or "
+#~ "is unrecognized by the implementation."
+#~ msgstr ""
+#~ "El mecanismo especificado no está soportado por la credencial provista, o "
+#~ "es irreconocible por la implementación."
+
+#~ msgid "The provided target_name parameter was ill-formed."
+#~ msgstr "El parámetro target_name no ha sido formado correctamente."
+
+#~ msgid ""
+#~ "The provided target_name parameter contained an invalid or unsupported "
+#~ "type of name."
+#~ msgstr ""
+#~ "El parámetro target_name proporcionado contenía un tipo de nombre "
+#~ "inválido o no soportado."
+
+#~ msgid ""
+#~ "The input_token contains different channel bindings to those specified "
+#~ "via the input_chan_bindings parameter."
+#~ msgstr ""
+#~ "input_token contiene diferentes vinculaciones de canal a aquellas "
+#~ "especificadas por medio del parámetro input_chan_bindings."
+
+#~ msgid ""
+#~ "The input_token contains an invalid signature, or a signature that could "
+#~ "not be verified."
+#~ msgstr ""
+#~ "input_token contiene una firma inválida, o una firma que no pudo ser "
+#~ "verificada."
+
+#~ msgid ""
+#~ "The supplied credentials were not valid for context initiation, or the "
+#~ "credential handle did not reference any credentials."
+#~ msgstr ""
+#~ "Las credenciales suministradas no fueron válidas para la iniciación del "
+#~ "contexto, o el manipulador de credenciales no referenciaba ninguna "
+#~ "credencial."
+
+#~ msgid "The supplied context handle did not refer to a valid context."
+#~ msgstr ""
+#~ "El manipulador de contexto suministrado no se refiere a un contexto "
+#~ "válido."
+
+#~ msgid "The consistency checks performed on the input_token failed."
+#~ msgstr "Los chequeos de consistencia efectuados en input_token han fallado."
+
+#~ msgid "The consistency checks performed on the credential failed."
+#~ msgstr ""
+#~ "Han fallado los chequeos de consistencia realizados en la credencial."
+
+#~ msgid "The referenced credentials have expired."
+#~ msgstr "Las credenciales referenciadas han expirado."
+
+#~ msgid "Bad authentication response from server."
+#~ msgstr "Respuesta de autenticación errónea desde el servidor."
+
+#~ msgid "Unsupported security layer."
+#~ msgstr "Capa de seguridad no soportada."
+
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
+
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr ""
+#~ "Esta opción conectará con el servidor usando autenticación Kerberos 4."
+
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo obtener el pase Kerberos:\n"
+#~ "%s"
+
+#~ msgid "Login"
+#~ msgstr "Inicio de sesión"
+
+#~ msgid "This option will connect to the server using a simple password."
+#~ msgstr "Esta opción conectará con el servidor usando una simple contraseña."
+
+#~ msgid "Unknown authentication state."
+#~ msgstr "Estado de la autenticación desconocido."
+
+#~ msgid "NTLM / SPA"
+#~ msgstr "NTLM / SPA"
+
+#~ msgid ""
+#~ "This option will connect to a Windows-based server using NTLM / Secure "
+#~ "Password Authentication."
+#~ msgstr ""
+#~ "Esta opción conectará a un servidor basado en Windows usando NTLM / "
+#~ "Secure Password Autentication."
+
+#~ msgid "PLAIN"
+#~ msgstr "PLAIN"
+
+#~ msgid "POP before SMTP"
+#~ msgstr "POP antes de SMTP"
+
+#~ msgid "This option will authorise a POP connection before attempting SMTP"
+#~ msgstr "Esta opción autorizará conexiones POP antes de intentar SMTP"
+
+#~ msgid "POP Source URI"
+#~ msgstr "URI de la fuente POP"
+
+#~ msgid "POP Before SMTP auth using an unknown transport"
+#~ msgstr "Autenticación POP antes de SMTP usando un transporte desconocido"
+
+#~ msgid "POP Before SMTP auth using a non-pop source"
+#~ msgstr "Autenticación POP antes de SMTP usando una fuente no POP"
+
+#~ msgid "Regular expression compilation failed: %s: %s"
+#~ msgstr "Falló la compilación de la expresión regular: %s: %s"
+
+#~ msgid "URL '%s' needs a username component"
+#~ msgstr "La URL «%s» necesita un componente de nombre de usuario"
+
+#~ msgid "URL '%s' needs a host component"
+#~ msgstr "La URL «%s» necesita un componente host"
+
+#~ msgid "URL '%s' needs a path component"
+#~ msgstr "La URL «%s» necesita un componente de ruta"
+
+#, fuzzy
+#~ msgid "cannot create thread"
+#~ msgstr "No se pudo crear el mensaje CMS"
+
+#~ msgid "Resolving: %s"
+#~ msgstr "Resolviendo: %s"
+
+#, fuzzy
+#~ msgid "Host lookup failed"
+#~ msgstr "Error al resolver el host: razón desconocida"
+
+#~ msgid "Resolving address"
+#~ msgstr "Resolviendo dirección"
+
+#~ msgid ""
+#~ "Could not create directory %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo crear el directorio %s:\n"
+#~ "%s"
+
+#~ msgid "Enter security pass-phrase for `%s'"
+#~ msgstr "Introduzca su frase de paso para %s"
+
+#~ msgid "Cannot find certificate for '%s'"
+#~ msgstr "No se puede encontrar el certificado para «%s»"
+
+#~ msgid "Cannot create CMS message"
+#~ msgstr "No se pudo crear el mensaje CMS"
+
+#, fuzzy
+#~ msgid "Cannot create CMS signed data"
+#~ msgstr "No se puede crear el CMS signedData"
+
+#, fuzzy
+#~ msgid "Cannot attach CMS signed data"
+#~ msgstr "No se pudo adjuntar el CMS signedData"
+
+#~ msgid "Cannot attach CMS data"
+#~ msgstr "No se pudo adjuntar los datos CMS"
+
+#, fuzzy
+#~ msgid "Cannot create CMS Signer information"
+#~ msgstr "No se puede crear la información CMS SignerInfo"
+
+#, fuzzy
+#~ msgid "Cannot find certificate chain"
+#~ msgstr "No se puede encontrar la cadena del certificado"
+
+#, fuzzy
+#~ msgid "Cannot add CMS Signing time"
+#~ msgstr "No se puede añadir la hora de firma CMS"
+
+#, fuzzy
+#~ msgid "Encryption certificate for '%s' does not exist"
+#~ msgstr "No existe el certificado de cifrado para «%s»"
+
+#~ msgid "Cannot add SMIMEEncKeyPrefs attribute"
+#~ msgstr "No se puede añadir el atributo SMIMEEncKeyPrefs"
+
+#~ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+#~ msgstr "No se puede añadir el atributo SMIMEEncKeyPrefs"
+
+#~ msgid "Cannot add encryption certificate"
+#~ msgstr "No se puede añadir el certificado de cifrado"
+
+#, fuzzy
+#~ msgid "Cannot add CMS Signer information"
+#~ msgstr "No se puede añadir la información del firmante CMS"
+
+#~ msgid "Cannot create encoder context"
+#~ msgstr "No se pudo crear un contexto de codificación"
+
+#~ msgid "Failed to add data to CMS encoder"
+#~ msgstr "Falló al añadir datos al codificador CMS"
+
+#~ msgid "Failed to encode data"
+#~ msgstr "Falló al codificar datos"
+
+#~ msgid "Unverified"
+#~ msgstr "Sin verificar"
+
+#~ msgid "Good signature"
+#~ msgstr "Firma buena"
+
+#~ msgid "Bad signature"
+#~ msgstr "Firma mala"
+
+#~ msgid "Content tampered with or altered in transit"
+#~ msgstr "El contenido ha sido falsificado o alterado en tránsito"
+
+#~ msgid "Signing certificate not found"
+#~ msgstr "Certificado firmante no encontrado"
+
+#~ msgid "Signing certificate not trusted"
+#~ msgstr "Certificado firmante sin confianza"
+
+#~ msgid "Signature algorithm unknown"
+#~ msgstr "Algoritmo de firma desconocido"
+
+#~ msgid "Signature algorithm unsupported"
+#~ msgstr "Algoritmo de firma no soportado"
+
+#~ msgid "Processing error"
+#~ msgstr "Error de procesamiento"
+
+#, fuzzy
+#~ msgid "No signed data in signature"
+#~ msgstr "No hay datos firmados en la firma"
+
+#~ msgid "Digests missing from enveloped data"
+#~ msgstr "Faltan los digests de los datos envueltos"
+
+#~ msgid "Cannot calculate digests"
+#~ msgstr "No se pudieron calcular los digests"
+
+#~ msgid "Cannot set message digests"
+#~ msgstr "No se pueden obtener los digests del mensaje"
+
+#~ msgid "Certificate import failed"
+#~ msgstr "Falló en la importación del certificado"
+
+#, fuzzy
+#~ msgid "Certificate is the only message, cannot verify certificates"
+#~ msgstr ""
+#~ "Mensaje sólo de certificado, no se pueden verificar los certificados"
+
+#, fuzzy
+#~ msgid "Certificate is the only message, certificates imported and verified"
+#~ msgstr "Mensaje sólo de certificado, certificados importados y verificados"
+
+#~ msgid "Cannot find signature digests"
+#~ msgstr "No se pueden encontrar los digests de la firma"
+
+#~ msgid "Signer: %s <%s>: %s\n"
+#~ msgstr "Firmante: %s <%s>: %s\n"
+
+#~ msgid "Decoder failed"
+#~ msgstr "La decodificación ha fallado"
+
+#~ msgid "Cannot find certificate for `%s'"
+#~ msgstr "No se puede encontrar el certificado para «%s»"
+
+#~ msgid "Cannot find common bulk encryption algorithm"
+#~ msgstr "No se puede encontrar un algoritmo de encriptación común"
+
+#~ msgid "Cannot allocate slot for encryption bulk key"
+#~ msgstr "No se puede reservar un slot para la clave de encriptación"
+
+#~ msgid "Cannot create CMS Message"
+#~ msgstr "No se pudo crear el mensaje CMS"
+
+#, fuzzy
+#~ msgid "Cannot create CMS Enveloped data"
+#~ msgstr "No se puede crear CMS EnvelopedData"
+
+#, fuzzy
+#~ msgid "Cannot attach CMS Enveloped data"
+#~ msgstr "No se puede adjuntar CMS EvelopedData"
+
+#~ msgid "Cannot attach CMS data object"
+#~ msgstr "No se puede adjuntar el objeto de datos CMS"
+
+#, fuzzy
+#~ msgid "Cannot create CMS Recipient information"
+#~ msgstr "No se puede crear CMS RecipientInfo"
+
+#, fuzzy
+#~ msgid "Cannot add CMS Recipient information"
+#~ msgstr "No se puede añadir CMS RecipientInfo"
+
+#~ msgid "Failed to add data to encoder"
+#~ msgstr "Falló al añadir datos al codificador"
+
+#~ msgid "Decoder failed, error %d"
+#~ msgstr "El decodificador ha fallado, error %d"
+
+#~ msgid "S/MIME Decrypt: No encrypted content found"
+#~ msgstr "Desencriptación S/MIME: No se ha encontrado contenido encriptado"
+
+#~ msgid "import keys: unimplemented"
+#~ msgstr "importación de claves: no implementado"
+
+#~ msgid "export keys: unimplemented"
+#~ msgstr "exportación de claves: no implementado"
+
+#~ msgid "Cannot get folder: Invalid operation on this store"
+#~ msgstr "No se pudo obtener la carpeta: Operación no válida en este almacén"
+
+#~ msgid "Cannot create folder `%s': folder exists"
+#~ msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
+
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "No se pudo crear la carpeta: Operación no válida en este almacén"
+
+#~ msgid "Cannot create folder: %s: folder exists"
+#~ msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
+
+#~ msgid "Cannot delete folder: %s: Invalid operation"
+#~ msgstr "No se pudo borrar la carpeta: %s: Operación no válida"
+
+#~ msgid "Cannot rename folder: %s: Invalid operation"
+#~ msgstr "No se pudo renombrar la carpeta: %s: Operación no válida"
+
+#~ msgid "Trash"
+#~ msgstr "Papelera"
+
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "No se pudo obtener el certificado del emisor"
+
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "No se pudo obtener la Lista de Revocación de Certificados"
+
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "No se pudo descifrar la firma del certificado"
+
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr ""
+#~ "No se pudo descifrar la firma de la Lista de Revocación de Certificados"
+
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "No se pudo decodificar la clave pública del emisor"
+
+#~ msgid "Certificate signature failure"
+#~ msgstr "Falló en la firma del certificado"
+
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "Fallo en la firma de la lista de revocación de certificados"
+
+#~ msgid "Certificate not yet valid"
+#~ msgstr "Certificado aún no válido"
+
+#~ msgid "Certificate has expired"
+#~ msgstr "El certificado ha caducado"
+
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL todavía no válida"
+
+#~ msgid "CRL has expired"
+#~ msgstr "La CRL ha caducado"
+
+#~ msgid "Error in CRL"
+#~ msgstr "Error en CRL"
+
+#~ msgid "Out of memory"
+#~ msgstr "Memoria agotada"
+
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "Certificado de profundidad cero auto-firmado"
+
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "Certificado auto-firmado en cadena"
+
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "No se pudo obtener el certificado del emisor localmente"
+
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "No se pudo verificar firma de la la hoja"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "Cadena de certificados demasiado larga"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "Certificado revocado"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "Autoridad certificadora inválida (CA)"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "Longitud de ruta excedida"
+
+#~ msgid "Invalid purpose"
+#~ msgstr "Propósito inválido"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "Certificado sin confianza"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "Certificado rechazado"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "Incoherencia Asunto/Emisor"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "No coincide AKID/SKID "
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "Las series AKID/Issuer no coinciden"
+
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "El uso de la clave no soporta firmado de certificados"
+
+#~ msgid "Error in application verification"
+#~ msgstr "Error en la verificación de la aplicación"
+
+#~ msgid ""
+#~ "Issuer:            %s\n"
+#~ "Subject:           %s\n"
+#~ "Fingerprint:       %s\n"
+#~ "Signature:         %s"
+#~ msgstr ""
+#~ "Emisor:        %s\n"
+#~ "Tema:         %s\n"
+#~ "Huella:        %s\n"
+#~ "Firma:         %s"
+
+#~ msgid "GOOD"
+#~ msgstr "GOOD"
+
+#~ msgid "BAD"
+#~ msgstr "BAD"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "Certificado erróneo de %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "¿Quiere aceptarlo de todos modos?"
+
+#~ msgid ""
+#~ "SSL Certificate check for %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept?"
+#~ msgstr ""
+#~ "Solicitud de Certificado SSL %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "¿Quiere aceptar?"
+
+#~ msgid ""
+#~ "Certificate problem: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Problema del certificado: %s\n"
+#~ "Emisor: %s"
+
+#~ msgid ""
+#~ "Bad certificate domain: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Dominio del certificado erróneo: %s\n"
+#~ "Emisor: %s"
+
+#~ msgid ""
+#~ "Certificate expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Certificado caducado: %s\n"
+#~ "Emisor: %s"
+
+#~ msgid ""
+#~ "Certificate revocation list expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Lista de revocación de certificados caducada: %s\n"
+#~ "Emisor: %s"
+
+#~ msgid "Could not parse URL `%s'"
+#~ msgstr "No se pudo analizar la URL «%s»"
+
+#~ msgid "Error storing `%s': %s"
+#~ msgstr "Error guardando «%s»: %s"
+
+#~ msgid "No such message %s in %s"
+#~ msgstr "No existe el mensaje %s en %s"
+
+#~ msgid "Cannot copy or move messages into a Virtual Folder"
+#~ msgstr "No se pudo copiar o mover mensajes a una Carpeta Virtual"
+
+#~ msgid "Cannot delete folder: %s: No such folder"
+#~ msgstr "No se pudo borrar la carpeta: %s: No existe tal carpeta"
+
+#~ msgid "Cannot rename folder: %s: No such folder"
+#~ msgstr "No se pudo cambiarle el nombre a la carpeta: %s: No existe"
+
+#~ msgid "Cannot copy messages to the Trash folder"
+#~ msgstr "No puede copiar mensajes a la carpeta Basura"
+
+#~ msgid "Cannot copy messages to the Junk folder"
+#~ msgstr "No puede copiar mensajes a la carpeta «Spam»"
+
+#~ msgid "Checking for new mail"
+#~ msgstr "Comprobación de correo nuevo"
+
+#~ msgid "Check for new messages in all folders"
+#~ msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
+
+#~ msgid "Apply filters to new messages in Inbox on this server"
+#~ msgstr ""
+#~ "Aplicar filtros a los mensajes nuevos en la bandeja de entrada de este "
+#~ "servidor"
+
+#~ msgid "Check new messages for Junk contents"
+#~ msgstr "Comprobar si el contenido de los mensajes nuevos es spam"
+
+#~ msgid "Only check for Junk messages in the INBOX folder"
+#~ msgstr "Sólo comprobar si hay spam en la carpeta INBOX"
+
+#~ msgid "Automatically synchronize remote mail locally"
+#~ msgstr "Sincronizar automáticamente el correo remoto localmente"
+
+#~ msgid "Address Book and Calendar"
+#~ msgstr "Libreta de direcciones y calendario"
+
+#~ msgid "Post Office Agent:"
+#~ msgstr "Agente de oficina de correos:"
+
+#~ msgid "Post Office Agent SOAP Port:"
+#~ msgstr "Puerto del agente de la oficina de correos SOAP:"
+
+#~ msgid "Use Secure Connection (SSL)"
+#~ msgstr "Usar conexión segura (SSL)"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "For accessing Novell Groupwise servers"
+#~ msgstr "Para acceder a servidores Novell Groupwise"
+
+#~ msgid "Password"
+#~ msgstr "Contraseña"
+
+#~ msgid ""
+#~ "This option will connect to the IMAP server using a plaintext password."
+#~ msgstr ""
+#~ "Esta opción conectará con el servidor IMAP usando una contraseña de texto "
+#~ "plano."
+
+#~ msgid "Operation cancelled"
+#~ msgstr "Operación cancelada"
+
+#~ msgid "Server unexpectedly disconnected: %s"
+#~ msgstr "El servidor se desconectó inesperadamente: %s"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s@%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Respuesta inesperada del servidor IMAP: %s@%s:\n"
+#~ "%s"
+
+#~ msgid "Unexpected response from IMAP server: %s"
+#~ msgstr "Respuesta inesperada del servidor IMAP: %s"
+
+#~ msgid "IMAP command failed: %s"
+#~ msgstr "El comando IMAP ha fallado: %s"
+
+#~ msgid "Server response ended too soon."
+#~ msgstr "La respuesta del servidor terminó demasiado pronto."
+
+#~ msgid "IMAP server response did not contain %s information"
+#~ msgstr "La respuesta del servidor IMAP no contenía información de %s"
+
+#~ msgid "Unexpected OK response from IMAP server: %s"
+#~ msgstr "El servidor IMAP inesperadamente ha respondido OK: %s"
+
+#~ msgid "Could not create directory %s: %s"
+#~ msgstr "No se pudo crear el directorio %s: %s"
+
+#~ msgid "Could not load summary for %s"
+#~ msgstr "No se pudo cargar el resumen de %s"
+
+#~ msgid "Folder was destroyed and recreated on server."
+#~ msgstr "La carpeta fue destruida y recreada en el servidor."
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "Buscando mensajes modificados"
+
+#~ msgid "Unable to retrieve message: %s"
+#~ msgstr "No se pudo descargar el mensaje: %s"
+
+#~ msgid ""
+#~ "Cannot get message: %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "No se pudo obtener el mensaje; %s\n"
+#~ "  %s"
+
+#~ msgid "No such message"
+#~ msgstr "No existe ese mensaje"
+
+#~ msgid "This message is not currently available"
+#~ msgstr "Este mensaje no está disponible actualmente"
+
+#~ msgid "Fetching summary information for new messages"
+#~ msgstr "Obteniendo información de los nuevos mensajes"
+
+#~ msgid "Incomplete server response: no information provided for message %d"
+#~ msgstr ""
+#~ "Respuesta del servidor incompleta: no hay información proporcionada para "
+#~ "el mensaje %d"
+
+#~ msgid "Incomplete server response: no UID provided for message %d"
+#~ msgstr ""
+#~ "Respuesta incompleta del servidor: No se proporcionó un UID para el "
+#~ "mensaje %d"
+
+#~ msgid ""
+#~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
+#~ msgstr ""
+#~ "Respuesta inesperada del servidor: Se proporcionaron UIDs idénticos para "
+#~ "los mensajes %d y %d"
+
+#~ msgid "Could not find message body in FETCH response."
+#~ msgstr ""
+#~ "No se pudo encontrar el cuerpo del mensaje en la respuesta de FETCH."
+
+#~ msgid "Could not open cache directory: %s"
+#~ msgstr "No se pudo abrir directorio de cache: %s"
+
+#~ msgid "Failed to cache message %s: %s"
+#~ msgstr "Error al cachear el mensaje %s: %s"
+
+#~ msgid "Failed to cache %s: %s"
+#~ msgstr "Error al cachear %s: %s"
+
+#~ msgid "Connection to Server"
+#~ msgstr "Conexión con el servidor"
+
+#~ msgid "Use custom command to connect to server"
+#~ msgstr "Usar un comando personalizado para conectarse al servidor"
+
+#~ msgid "Folders"
+#~ msgstr "Carpetas"
+
+#~ msgid "Show only subscribed folders"
+#~ msgstr "Mostrar sólo las carpetas suscritas"
+
+#~ msgid "Override server-supplied folder namespace"
+#~ msgstr "Ignorar el espacio de nombres suministrado por el servidor"
+
+#~ msgid "Namespace"
+#~ msgstr "Espacio de nombres"
+
+#~ msgid "Apply filters to new messages in INBOX on this server"
+#~ msgstr ""
+#~ "Aplicar filtros a los mensajes nuevos en la bandeja de entrada de este "
+#~ "servidor"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "For reading and storing mail on IMAP servers."
+#~ msgstr "Para leer y almacenar correo en los servidores IMAP."
+
+#~ msgid "IMAP server %s"
+#~ msgstr "Servidor IMAP %s"
+
+#~ msgid "IMAP service for %s on %s"
+#~ msgstr "Servicio IMAP para %s en %s"
+
+#, fuzzy
+#~ msgid "Could not connect to %s (port %s): %s"
+#~ msgstr "No se pudo conectar con %s (puerto %d): %s"
+
+#~ msgid "SSL unavailable"
+#~ msgstr "SSL no disponible"
+
+#~ msgid "Connection cancelled"
+#~ msgstr "Conexión cancelada"
+
+#~ msgid "Failed to connect to IMAP server %s in secure mode: %s"
+#~ msgstr "Falló al conectar al servidor IMAP %s en modo seguro: %s"
+
+#~ msgid "SSL/TLS extension not supported."
+#~ msgstr "Extensión SSL/TLS no implementada."
+
+#~ msgid "SSL negotiations failed"
+#~ msgstr "Falló la negociación SSL"
+
+#~ msgid "Could not connect with command \"%s\": %s"
+#~ msgstr "No se pudo conectar con el comando «%s»: %s"
+
+#~ msgid "IMAP server %s does not support requested authentication type %s"
+#~ msgstr ""
+#~ "El servidor IMAP %s no soporta el método de autenticación requerido %s"
+
+#~ msgid "No support for authentication type %s"
+#~ msgstr "No hay soporte para el tipo de autenticación %s"
+
+#~ msgid "%sPlease enter the IMAP password for %s@%s"
+#~ msgstr "%s escriba la contraseña IMAP para %s@%s"
+
+#~ msgid "You didn't enter a password."
+#~ msgstr "No introdujo una contraseña."
+
+#~ msgid ""
+#~ "Unable to authenticate to IMAP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "No se pudo autenticar en el servidor IMAP.\n"
+#~ "%s\n"
+#~ "\n"
+
+#~ msgid "No such folder %s"
+#~ msgstr "No existe la carpeta %s"
+
+#~ msgid ""
+#~ "The folder name \"%s\" is invalid because it contains the character \"%c\""
+#~ msgstr ""
+#~ "El nombre de la carpeta «%s» es inválido porque contiene el carácter «%c»"
+
+#~ msgid "The parent folder is not allowed to contain subfolders"
+#~ msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
+
+#~ msgid "Cannot create folder `%s': folder exists."
+#~ msgstr "No se pudo crear la carpeta: %s: la carpeta existe."
+
+#~ msgid "Unknown parent folder: %s"
+#~ msgstr "Carpeta padre desconocida: %s"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Falló al enviar el comando al servidor IMAP %s: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "Respuesta inesperada del servidor IMAP4 %s: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "Anuncio de bienvenida inesperado del servidor IMAP: %s."
+
+#~ msgid "Cannot select folder `%s': Invalid mailbox name"
+#~ msgstr "No se pudo seleccionar la carpeta «%s»: Nombre de buzón inválido"
+
+#~ msgid "Cannot select folder `%s': Bad command"
+#~ msgstr "No se pudo seleccionar la carpeta «%s»: Comando erróneo"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "El servidor IMAP4 %s se desconectó inesperadamente: %s"
+
+#~ msgid "Cannot sync flags to folder `%s': Unknown"
+#~ msgstr "No se pudo sincronizar los flags de la carpeta: «%s»: Desconocido"
+
+#~ msgid "Cannot sync flags to folder `%s': Bad command"
+#~ msgstr ""
+#~ "No se pudo sincronizar los flags de la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Cannot expunge folder `%s': Unknown"
+#~ msgstr "No se pudo compactar la carpeta: «%s»: Desconocido"
+
+#~ msgid "Cannot expunge folder `%s': Bad command"
+#~ msgstr "No se pudo compactar la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Cannot get message %s from folder `%s': No such message"
+#~ msgstr ""
+#~ "No se pudo obtener el mensaje; %s de la carpeta «%s»: No existe dicho "
+#~ "mensaje"
+
+#~ msgid "Cannot get message %s from folder `%s': Bad command"
+#~ msgstr ""
+#~ "No se pudo obtener el mensaje; %s de la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Cannot append message to folder `%s': Unknown error"
+#~ msgstr "No se pudo agregar el mensaje a la carpeta «%s»: Error desconocido"
+
+#~ msgid "Cannot append message to folder `%s': Bad command"
+#~ msgstr "No se pudo agregar el mensaje a la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+#~ msgstr ""
+#~ "No se pudo mover los mensajes de la carpeta «%s» a la carpeta «%s»: "
+#~ "Desconocido"
+
+#~ msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+#~ msgstr ""
+#~ "No se pudo copiar los mensajes desde la carpeta «%s» a la carpeta «%s»: "
+#~ "Desconocido"
+
+#~ msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+#~ msgstr ""
+#~ "No se pudo mover los mensajes desde la carpeta «%s» a la carpeta «%s»: "
+#~ "Comando erróneo"
+
+#~ msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+#~ msgstr ""
+#~ "No se pudo copiar los mensajes desde la carpeta «%s» a la carpeta «%s»: "
+#~ "Comando erróneo"
+
+#~ msgid "IMAPv4rev1"
+#~ msgstr "IMAPv4rev1 "
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+#~ msgstr ""
+#~ "Para leer y almacenar correo en los servidores IMAPv4rev. ¡¡EXPERIMENTAL!!"
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "Esta opción conectará con el servidor IMAPv4rev1 usando una contraseña de "
+#~ "texto plano."
+
+#~ msgid "Could not connect to %s (port %d): %s"
+#~ msgstr "No se pudo conectar con %s (puerto %d): %s"
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "Falló al conectar al servidor IMAP %s en modo seguro: El servidor no "
+#~ "soporta STARTTLS"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr ""
+#~ "No se pudo autenticar con el servidor IMAP %s usando el mecanismo de "
+#~ "autenticación %s"
+
+#~ msgid "%sPlease enter the IMAP password for %s on host %s"
+#~ msgstr "%s Escriba la contraseña IMAP para %s en el host %s"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "No se pudo autenticar frente al servidor IMAP %s usando %s"
+
+#~ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+#~ msgstr ""
+#~ "No se pudo obtener la carpeta «%s» en el servidor IMAP %s: Desconocido"
+
+#~ msgid "Cannot create folder `%s': Invalid mailbox name"
+#~ msgstr "No se pudo crear la carpeta «%s»: Nombre de buzón inválido"
+
+#~ msgid "Cannot create folder `%s': Bad command"
+#~ msgstr "No se pudo crear la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Cannot delete folder `%s': Special folder"
+#~ msgstr "No se pudo borrar la carpeta «%s»: Carpeta especial"
+
+#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
+#~ msgstr "No se pudo borrar la carpeta: «%s»: Nombre de buzón inválido"
+
+#~ msgid "Cannot delete folder `%s': Bad command"
+#~ msgstr "No se pudo borrar la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Cannot rename folder `%s' to `%s': Special folder"
+#~ msgstr "No se pudo renombrar la carpeta «%s» a «%s»: Carpeta especial"
+
+#~ msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "No se pudo renombrar la carpeta «%s» a «%s»: Nombre de buzón inválido"
+
+#~ msgid "Cannot rename folder `%s' to `%s': Bad command"
+#~ msgstr "No se pudo renombrar la carpeta «%s» a «%s»: Comando erróneo"
+
+#~ msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "No se pudo obtener la información %s para el patrón «%s» en el servidor "
+#~ "IMAP %s:%s"
+
+#~ msgid "Bad command"
+#~ msgstr "Comando erróneo"
+
+#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+#~ msgstr "No pudo suscribirse a la carpeta «%s»: Nombre de buzón inválido"
+
+#~ msgid "Cannot subscribe to folder `%s': Bad command"
+#~ msgstr "No pudo suscribirse a la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+#~ msgstr "No pudo desuscribirse de la carpeta «%s»: Nombre de buzón inválido"
+
+#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
+#~ msgstr "No pudo desuscribirse de la carpeta «%s»: Comando erróneo"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "Etiqueta inesperada en la respuesta del servidor IMAP %s: "
+
+#~ msgid "No data"
+#~ msgstr "Sin datos"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "El servidor IMAP %s se desconectó inesperadamente: %s"
+
+#~ msgid "Message storage"
+#~ msgstr "Almacenamiento del mensaje"
+
+#~ msgid "IMAP+"
+#~ msgstr "IMAP+"
+
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "Cliente experimental IMAP 4(.1) \n"
+#~ "Este código no está probado y no está soportado, quizá desee usar imap "
+#~ "plano en su lugar.\n"
+#~ "\n"
+#~ " !!! NO USAR ESTO PARA CORREO EN PRODUCCIÓN  !!!\n"
+
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "No se pudo conectar con el servidor POP en %s"
+
+#~ msgid "Index message body data"
+#~ msgstr "Indexar datos del cuerpo del mensaje"
+
+#~ msgid "~%s (%s)"
+#~ msgstr "~%s (%s)"
+
+#~ msgid "mailbox:%s (%s)"
+#~ msgstr "buzón: %s: (%s)"
+
+#~ msgid "%s (%s)"
+#~ msgstr "%s (%s)"
+
+#~ msgid "Use the `.folders' folder summary file (exmh)"
+#~ msgstr "Utilice el archivo de sumario de las carpetas «.folder» (exmh)"
+
+#~ msgid "MH-format mail directories"
+#~ msgstr "Directorios de correo en formato MH"
+
+#~ msgid "For storing local mail in MH-like mail directories."
+#~ msgstr "Para guardar el correo local en directorios del tipo MH."
+
+#~ msgid ""
+#~ "For retrieving (moving) local mail from standard mbox formated spools "
+#~ "into folders managed by Evolution."
+#~ msgstr ""
+#~ "Para obtener (moviendo) el correo local de colas de correo mbox estándar "
+#~ "a carpetas gestionadas por Evolution."
+
+#~ msgid "Apply filters to new messages in INBOX"
+#~ msgstr "Aplicar filtros a los mensajes nuevos en la bandeja de entrada"
+
+#~ msgid "Maildir-format mail directories"
+#~ msgstr "Directorios de correo en formato Maildir"
+
+#~ msgid "For storing local mail in maildir directories."
+#~ msgstr "Para guardar el correo local en directorios del tipo maildir."
+
+#~ msgid "Store status headers in Elm/Pine/Mutt format"
+#~ msgstr "Almacenar cabeceras de estado en formato Elm/Pine/Mutt"
+
+#~ msgid "Standard Unix mbox spool or directory"
+#~ msgstr "Mbox estándar de Unix"
+
+#~ msgid ""
+#~ "For reading and storing local mail in external standard mbox spool "
+#~ "files.\n"
+#~ "May also be used to read a tree of Elm, Pine, or Mutt style folders."
+#~ msgstr ""
+#~ "Para leer y guardar el correo local en directorios externos estándar "
+#~ "mbox.\n"
+#~ "También puede ser usado para leer un árbol del estilo de carpetas de Elm, "
+#~ "Pine o Mutt."
+
+#~ msgid "Store root %s is not an absolute path"
+#~ msgstr "El almacén raíz %s no es una ruta absoluta"
+
+#~ msgid "Store root %s is not a regular directory"
+#~ msgstr "El almacén raíz %s no es un directorio regular"
+
+#~ msgid "Cannot get folder: %s: %s"
+#~ msgstr "No se pudo acceder a la carpeta: %s: %s"
+
+#~ msgid "Local stores do not have an inbox"
+#~ msgstr "Los almacenes locales no tienen una bandeja de entrada"
+
+#~ msgid "Local mail file %s"
+#~ msgstr "Archivo de correo local %s"
+
+#~ msgid "Could not rename folder %s to %s: %s"
+#~ msgstr "No se pudo cambiar el nombre de la carpeta %s a %s: %s"
+
+#~ msgid "Could not rename '%s': %s"
+#~ msgstr "No se pudo renombrar: «%s»: %s"
+
+#~ msgid "Could not delete folder summary file `%s': %s"
+#~ msgstr "No se pudo borrar el resumen la carpeta «%s»: %s"
+
+#~ msgid "Could not delete folder index file `%s': %s"
+#~ msgstr "No se pudo borrar el índice de la carpeta «%s»: %s"
+
+#~ msgid "Could not delete folder meta file `%s': %s"
+#~ msgstr "No se pudieron borrar los metadatos de la carpeta «%s»: %s"
+
+#~ msgid "Could not save summary: %s: %s"
+#~ msgstr "No se pudo guardar el resumen: %s: %s"
+
+#~ msgid "Unable to add message to summary: unknown reason"
+#~ msgstr "No se pudo añadir mensajes al resumen: razón desconocida"
+
+#~ msgid "Maildir append message cancelled"
+#~ msgstr "Mensaje añadido al Maildir cancelado"
+
+#~ msgid "Cannot append message to maildir folder: %s: %s"
+#~ msgstr "No se pudo añadir el mensaje a la carpeta tipo maildir: %s: %s"
+
+#~ msgid ""
+#~ "Cannot get message: %s from folder %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "No se pudo obtener el mensaje; %s de la carpeta %s\n"
+#~ "  %s"
+
+#
+#~ msgid "Invalid message contents"
+#~ msgstr "Contenido inválido en el mensaje"
+
+#~ msgid "Cannot get folder `%s': %s"
+#~ msgstr "No se pudo acceder a la carpeta: «%s»: %s"
+
+#~ msgid "Cannot get folder `%s': folder does not exist."
+#~ msgstr "No se puede obtener la carpeta «%s»: la carpeta no existe."
+
+#~ msgid "Cannot create folder `%s': %s"
+#~ msgstr "No se pudo crear la carpeta: «%s»: %s"
+
+#~ msgid "Cannot get folder `%s': not a maildir directory."
+#~ msgstr ""
+#~ "No se puede obtener la carpeta «%s»: no es un directorio tipo maildir."
+
+#~ msgid "Could not delete folder `%s': %s"
+#~ msgstr "No se pudo borrar la carpeta «%s»: %s"
+
+#~ msgid "not a maildir directory"
+#~ msgstr "no es un directorio tipo maildir"
+
+#~ msgid "Could not scan folder `%s': %s"
+#~ msgstr "No se pudo analizar la carpeta «%s»: %s"
+
+#~ msgid "Cannot open maildir directory path: %s: %s"
+#~ msgstr "No se pudo abrir el maildir en esta ruta: %s: %s"
+
+#~ msgid "Checking folder consistency"
+#~ msgstr "Comprobando la consistencia de la carpeta"
+
+#~ msgid "Checking for new messages"
+#~ msgstr "Comprobando si hay mensajes nuevos"
+
+#~ msgid "Storing folder"
+#~ msgstr "Guardando carpeta"
+
+#~ msgid "Cannot create folder lock on %s: %s"
+#~ msgstr "No se pudo crear un bloqueo de carpetas en %s: %s"
+
+#~ msgid "Cannot open mailbox: %s: %s\n"
+#~ msgstr "No se pudo abrir el buzón: %s: %s\n"
+
+#~ msgid "Mail append cancelled"
+#~ msgstr "Adición de mensaje cancelada"
+
+#~ msgid "Cannot append message to mbox file: %s: %s"
+#~ msgstr "No se pudo añadir el mensaje al archivo mbox: %s: %s"
+
+#~ msgid "The folder appears to be irrecoverably corrupted."
+#~ msgstr "La carpeta parece estar corrompida e irrecuperable."
+
+#~ msgid "Message construction failed."
+#~ msgstr "Falló la construcción del mensaje."
+
+#~ msgid "Cannot create a folder by this name."
+#~ msgstr "No se pudo crear una carpeta con ese nombre."
+
+#~ msgid "Cannot get folder `%s': not a regular file."
+#~ msgstr "No se pudo obtener la carpeta «%s»: no es un archivo regular."
+
+#~ msgid ""
+#~ "Could not delete folder `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo borrar la carpeta «%s»:\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a regular file."
+#~ msgstr "«%s» no es un archivo normal."
+
+#~ msgid "Folder `%s' is not empty. Not deleted."
+#~ msgstr "La carpeta «%s» no esta vacía. No fue borrada."
+
+#~ msgid "Cannot create directory `%s': %s."
+#~ msgstr "No se pudo crear el directorio «%s»: %s."
+
+#~ msgid "Cannot create folder: %s: %s"
+#~ msgstr "No se pudo crear la carpeta: %s: %s"
+
+#~ msgid "Folder already exists"
+#~ msgstr "La carpeta ya existe"
+
+#~ msgid "The new folder name is illegal."
+#~ msgstr "El nombre de carpeta nuevo es ilegal."
+
+#~ msgid "Could not rename `%s': `%s': %s"
+#~ msgstr "No se pudo renombrar: «%s»: «%s» : %s"
+
+#~ msgid "Could not rename '%s' to %s: %s"
+#~ msgstr "No se pudo renombrar «%s» a %s: %s"
+
+#~ msgid "Could not open folder: %s: %s"
+#~ msgstr "No se pudo abrir la carpeta: %s: %s"
+
+#~ msgid "Fatal mail parser error near position %ld in folder %s"
+#~ msgstr ""
+#~ "Análisis erróneo del correo cerca de la posición %ld en la carpeta %s"
+
+#~ msgid "Cannot check folder: %s: %s"
+#~ msgstr "No se pudo comprobar la carpeta: %s: %s"
+
+#~ msgid "Could not open file: %s: %s"
+#~ msgstr "No se pudo abrir el archivo %s: %s"
+
+#~ msgid "Cannot open temporary mailbox: %s"
+#~ msgstr "No se pudo abrir el archivo de correo temporal: %s"
+
+#~ msgid "Could not close source folder %s: %s"
+#~ msgstr "No se pudo cerrar la carpeta origen %s: %s"
+
+#~ msgid "Could not close temp folder: %s"
+#~ msgstr "No se pudo cerrar la carpeta temporal: %s"
+
+#~ msgid "Could not rename folder: %s"
+#~ msgstr "No se pudo cambiar el nombre a la carpeta: %s"
+
+#~ msgid "Summary and folder mismatch, even after a sync"
+#~ msgstr ""
+#~ "Resumen y carpeta no concuerdan, incluso después de una sincronización"
+
+#~ msgid "Unknown error: %s"
+#~ msgstr "Error desconocido: %s"
+
+#~ msgid "Could not store folder: %s"
+#~ msgstr "No se pudo almacenar carpeta:: %s"
+
+#~ msgid "Error writing to temp mailbox: %s"
+#~ msgstr "Error la escribir al archivo de correo temporal: %s"
+
+#~ msgid "Writing to tmp mailbox failed: %s: %s"
+#~ msgstr "Error la escribir al archivo temporal: %s: %s"
+
+#
+#~ msgid "MH append message cancelled"
+#~ msgstr "Adición de mensaje en el MH cancelada"
+
+#~ msgid "Cannot append message to mh folder: %s: %s"
+#~ msgstr "No se pudo añadir el mensaje a la carpeta mh: %s: %s"
+
+#~ msgid "Could not create folder `%s': %s"
+#~ msgstr "No se pudo crear la carpeta «%s»: %s"
+
+#~ msgid "Cannot get folder `%s': not a directory."
+#~ msgstr "No se pudo acceder a la carpeta: «%s»: no es un directorio."
+
+#~ msgid "Cannot open MH directory path: %s: %s"
+#~ msgstr "No se pudo abrir el directorio MH en la ruta: %s: %s"
+
+#~ msgid "Spool `%s' cannot be opened: %s"
+#~ msgstr "La cola «%s» no pudo abrirse: %s"
+
+#~ msgid "Spool `%s' is not a regular file or directory"
+#~ msgstr "El spool «%s» no es un directorio o archivo normal"
+
+#~ msgid "Folder `%s/%s' does not exist."
+#~ msgstr "La carpeta «%s/%s» no existe."
+
+#~ msgid ""
+#~ "Could not open folder `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo abrir la carpeta «%s»:\n"
+#~ "%s"
+
+#~ msgid "Folder `%s' does not exist."
+#~ msgstr "La carpeta «%s» no existe."
+
+#~ msgid ""
+#~ "Could not create folder `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo crear la carpeta «%s»:\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a mailbox file."
+#~ msgstr "«%s» no es un archivo mailbox."
+
+#~ msgid "Store does not support an INBOX"
+#~ msgstr "El almacén no soporta una bandeja de entrada"
+
+#~ msgid "Spool mail file %s"
+#~ msgstr "Archivo de cola de correo %s"
+
+#~ msgid "Spool folder tree %s"
+#~ msgstr "Árbol de carpetas de colas %s"
+
+#~ msgid "Spool folders cannot be renamed"
+#~ msgstr "Las carpetas de correo no pueden ser renombradas"
+
+#~ msgid "Spool folders cannot be deleted"
+#~ msgstr "Las carpetas de correo no pueden ser borradas"
+
+#~ msgid "Could not sync temporary folder %s: %s"
+#~ msgstr "No se pudo sincronizar la carpeta temporal %s: %s"
+
+#~ msgid "Could not sync spool folder %s: %s"
+#~ msgstr "No se pudo sincronizar la carpeta de correo %s: %s"
+
+#~ msgid ""
+#~ "Could not sync spool folder %s: %s\n"
+#~ "Folder may be corrupt, copy saved in `%s'"
+#~ msgstr ""
+#~ "No se pudo sincronizar la carpeta de correo %s: %s\n"
+#~ "La carpeta puede estar corrupta, copia guardada en «%s»"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Escriba la contraseña NNTP para %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "El servidor rechazó el nombre de usuario"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Falló al enviar el nombre de usuario al servidor"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "El servidor rechazó el nombre de usuario/contraseña"
+
+#~ msgid "Cannot get message %s: %s"
+#~ msgstr "No se pudo obtener mensaje %s: %s"
+
+#~ msgid "User cancelled"
+#~ msgstr "El usuario canceló"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Error interno: uid en formato inválido: %s"
+
+#~ msgid "Posting failed: %s"
+#~ msgstr "La publicación falló: %s"
+
+#~ msgid "You cannot post NNTP messages while working offline!"
+#~ msgstr "No puede publicar mensajes NNTP mientras trabaja desconectado."
+
+#~ msgid "You cannot copy messages from a NNTP folder!"
+#~ msgstr "No puede copiar mensajes desde una carpeta NNTP."
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "No se pudo obtener la lista de grupo del servidor."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "No se pudo cargar el archivo de lista de grupo: %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "No se pudo guardar el archivo de lista de grupo para %s: %s"
+
+#~ msgid ""
+#~ "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+#~ msgstr ""
+#~ "Mostrar carpetas en notación corta (ej: c.o.linux en vez de comp.os.linux)"
+
+#~ msgid "In the subscription dialog, show relative folder names"
+#~ msgstr ""
+#~ "En el diálogo de subscripción, mostrar nombres de carpetas relativos"
+
+#~ msgid "USENET news"
+#~ msgstr "Noticias USENET"
+
+#~ msgid "This is a provider for reading from and posting toUSENET newsgroups."
+#~ msgstr ""
+#~ "Este es un proveedor para leer y enviar noticias a grupos de USENET."
+
+#~ msgid ""
+#~ "This option will authenticate with the NNTP server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "Esta opción es para autenticarse con el servidor NNTP usando una "
+#~ "contraseña de texto."
+
+#~ msgid "NNTP Command failed: %s"
+#~ msgstr "El comando NNTP ha fallado: %s"
+
+#~ msgid "Could not read greeting from %s: %s"
+#~ msgstr "No se pudo leer saludo desde %s: %s"
+
+#~ msgid "NNTP server %s returned error code %d: %s"
+#~ msgstr "El servidor NNTP %s devolvió un código de error %d %s"
+
+#~ msgid "USENET News via %s"
+#~ msgstr "Noticias USENET vía %s"
+
+#~ msgid ""
+#~ "Error retrieving newsgroups:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error al obtener los grupos de noticias:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "You cannot subscribe to this newsgroup:\n"
+#~ "\n"
+#~ "No such newsgroup. The selected item is a probably a parent folder."
+#~ msgstr ""
+#~ "No puede suscribirse a este grupo de noticias:\n"
+#~ "\n"
+#~ "No existe dicho grupo. El elemento seleccionado probablemente es una "
+#~ "carpeta madre."
+
+#~ msgid ""
+#~ "You cannot unsubscribe to this newsgroup:\n"
+#~ "\n"
+#~ "newsgroup does not exist!"
+#~ msgstr ""
+#~ "No puede suscribirse a este grupo de noticias:\n"
+#~ "\n"
+#~ "el grupo de noticias no existe."
+
+#~ msgid "You cannot create a folder in a News store: subscribe instead."
+#~ msgstr ""
+#~ "No puede crear una carpeta en un almacén de noticias: suscríbase en su "
+#~ "lugar."
+
+#~ msgid "You cannot rename a folder in a News store."
+#~ msgstr "No se puede renombrar una carpeta en un almacén de noticias."
+
+#~ msgid "You cannot remove a folder in a News store: unsubscribe instead."
+#~ msgstr ""
+#~ "No puede eliminar una carpeta en un almacén de noticias:desuscríbase en "
+#~ "su lugar."
+
+#~ msgid "Authentication requested but not username provided"
+#~ msgstr ""
+#~ "Se solicito autenticación pero no se suministró un nombre de usuario"
+
+#~ msgid "Cannot authenticate to server: %s"
+#~ msgstr "No se pudo autenticar con el servidor: %s"
+
+#~ msgid "Not connected."
+#~ msgstr "No conectado."
+
+#~ msgid "No such folder: %s"
+#~ msgstr "No existe la carpeta %s"
+
+#~ msgid "%s: Scanning new messages"
+#~ msgstr "%s: Buscando mensajes nuevos"
+
+#~ msgid "Unexpected server response from xover: %s"
+#~ msgstr "Respuesta inesperada del servidor desde xover: %s"
+
+#~ msgid "Unexpected server response from head: %s"
+#~ msgstr "Respuesta inesperada del servidor desde head: %s"
+
+#~ msgid "Use cancel"
+#~ msgstr "Usar cancelar"
+
+#~ msgid "Operation failed: %s"
+#~ msgstr "Operación falló: %s"
+
+#~ msgid "Retrieving POP summary"
+#~ msgstr "Obteniendo resumen POP"
+
+#~ msgid "Cannot get POP summary: %s"
+#~ msgstr "No se pudo obtener el sumario POP: %s"
+
+#~ msgid "Expunging deleted messages"
+#~ msgstr "Eliminando los mensajes borrados"
+
+#~ msgid "No message with uid %s"
+#~ msgstr "No hay mensajes con uid %s"
+
+#~ msgid "Retrieving POP message %d"
+#~ msgstr "Obteniendo mensaje POP %d"
+
+#~ msgid "Leave messages on server"
+#~ msgstr "Dejar mensajes en el servidor"
+
+#~ msgid "Delete after %s day(s)"
+#~ msgstr "Borrar tras %s día(s)"
+
+#~ msgid "Disable support for all POP3 extensions"
+#~ msgstr "Desactivar soporte para todas las extensiones POP3"
+
+#~ msgid "POP"
+#~ msgstr "POP"
+
+#~ msgid "For connecting to and downloading mail from POP servers."
+#~ msgstr "Para conectarse y descargar correo de servidores POP."
+
+#~ msgid ""
+#~ "This option will connect to the POP server using a plaintext password. "
+#~ "This is the only option supported by many POP servers."
+#~ msgstr ""
+#~ "Esta opción es para conectar con servidores POP usando una contraseña en "
+#~ "texto plano. Esta es la única opción implementada por muchos servidores "
+#~ "POP."
+
+#~ msgid ""
+#~ "This option will connect to the POP server using an encrypted password "
+#~ "via the APOP protocol. This may not work for all users even on servers "
+#~ "that claim to support it."
+#~ msgstr ""
+#~ "Esta opción es para conectar con servidores POP usando una contraseña "
+#~ "cifrada por medio del protocolo APOP. Esto no funcionará para todos los "
+#~ "usuarios ni siquiera en servidores que dicen implementarlo."
+
+#, fuzzy
+#~ msgid "Could not connect to POP server %s (port %s): %s"
+#~ msgstr "No se pudo conectar al servidor POP %s (puerto %d): %s"
+
+#, fuzzy
+#~ msgid "Failed to read a valid greeting from POP server %s (port %s)"
+#~ msgstr ""
+#~ "No se pudo leer un saludo válido desde el servidor POP %s (puerto %d)"
+
+#~ msgid "Failed to connect to POP server %s in secure mode: %s"
+#~ msgstr "No se pudo conectar al servidor POP %s en modo seguro: %s"
+
+#~ msgid "Could not connect to POP server %s"
+#~ msgstr "No se pudo conectar con el servidor POP: %s"
+
+#~ msgid ""
+#~ "Unable to connect to POP server %s: No support for requested "
+#~ "authentication mechanism."
+#~ msgstr ""
+#~ "No se pudo conectar con el servidor POP %s: \n"
+#~ "No hay soporte para el sistema de autenticación pedido."
+
+#~ msgid "SASL `%s' Login failed for POP server %s: %s"
+#~ msgstr "SASL «%s» Falló el inicio de sesión para servidor POP %s: %s"
+
+#~ msgid "Cannot login to POP server %s: SASL Protocol error"
+#~ msgstr ""
+#~ "No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
+
+#~ msgid "Failed to authenticate on POP server %s: %s"
+#~ msgstr "No se pudo autenticarme en el servidor POP %s: %s"
+
+#~ msgid "%sPlease enter the POP password for %s on host %s"
+#~ msgstr "%s Escriba la contraseña POP para %s en el servidor %s"
+
+#~ msgid ""
+#~ "Unable to connect to POP server %s.\n"
+#~ "Error sending password: %s"
+#~ msgstr ""
+#~ "No se pudo conectar con el servidor POP %s.\n"
+#~ "Error al enviar la contraseña: %s"
+
+#~ msgid ""
+#~ "Unable to connect to POP server %s.\n"
+#~ "Error sending username: %s"
+#~ msgstr ""
+#~ "No se pudo conectar con el servidor POP %s.\n"
+#~ "Error al enviar nombre de usuario: %s"
+
+#~ msgid "No such folder `%s'."
+#~ msgstr "No existe la carpeta «%s»."
+
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid ""
+#~ "For delivering mail by passing it to the \"sendmail\" program on the "
+#~ "local system."
+#~ msgstr ""
+#~ "Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
+
+#~ msgid "Could not parse recipient list"
+#~ msgstr "No se pudo analizar la lista de destinatarios"
+
+#~ msgid "Could not create pipe to sendmail: %s: mail not sent"
+#~ msgstr "No se pudo comunicar con sendmail: %s: correo no enviado"
+
+#~ msgid "Could not fork sendmail: %s: mail not sent"
+#~ msgstr "No se pudo hacer un bifurcar a sendmail: %s: correo no enviado"
+
+#~ msgid "Could not send message: %s"
+#~ msgstr "No se pudo enviar mensaje: %s"
+
+#~ msgid "sendmail exited with signal %s: mail not sent."
+#~ msgstr "sendmail finalizó con %s: correo no enviado."
+
+#~ msgid "Could not execute %s: mail not sent."
+#~ msgstr "No se pudo ejecutar %s: correo no enviado."
+
+#~ msgid "sendmail exited with status %d: mail not sent."
+#~ msgstr "sendmail finalizó con estado %d: correo no enviado."
+
+#~ msgid "sendmail"
+#~ msgstr "sendmail"
+
+#~ msgid "Mail delivery via the sendmail program"
+#~ msgstr "Entregar correo por medio de sendmail"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+#~ msgstr ""
+#~ "Para entregar correo conectándose a un servidor de correo usando SMTP."
+
+#~ msgid "Syntax error, command unrecognized"
+#~ msgstr "Error de sintaxis, comando no reconocido"
+
+#~ msgid "Syntax error in parameters or arguments"
+#~ msgstr "Error de sintaxis en los parámetros o los argumentos"
+
+#~ msgid "Command not implemented"
+#~ msgstr "Comando no implementado"
+
+#~ msgid "Command parameter not implemented"
+#~ msgstr "Parámetro del comando no implementado"
+
+#~ msgid "System status, or system help reply"
+#~ msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
+
+#~ msgid "Help message"
+#~ msgstr "Mensaje de ayuda"
+
+#~ msgid "Service ready"
+#~ msgstr "Servicio preparado"
+
+#~ msgid "Service closing transmission channel"
+#~ msgstr "Servicio cerrando los canales de transmisión"
+
+#~ msgid "Service not available, closing transmission channel"
+#~ msgstr "Servicio no disponible, cerrando los canales de transmisión"
+
+#~ msgid "Requested mail action okay, completed"
+#~ msgstr "Acción de correo requerida en orden, completada"
+
+#~ msgid "User not local; will forward to <forward-path>"
+#~ msgstr "El usuario no es local; se reenviará a <forward-path>"
+
+#~ msgid "Requested mail action not taken: mailbox unavailable"
+#~ msgstr ""
+#~ "Acción solicitada del correo no realizada: el mailbox no está disponible"
+
+#~ msgid "Requested action not taken: mailbox unavailable"
+#~ msgstr "Acción solicitada no realizada: el mailbox no está disponible"
+
+#~ msgid "Requested action aborted: error in processing"
+#~ msgstr "Acción solicitada abortada: error en procesamiento"
+
+#~ msgid "User not local; please try <forward-path>"
+#~ msgstr "El usuario no es local; pruebe con <forward-path>"
+
+#~ msgid "Requested action not taken: insufficient system storage"
+#~ msgstr ""
+#~ "Acción solicitada no realizada: la capacidad del sistema es insuficiente"
+
+#~ msgid "Requested mail action aborted: exceeded storage allocation"
+#~ msgstr ""
+#~ "Acción solicitada no realizada: excedió la capacidad de almacenamiento"
+
+#~ msgid "Requested action not taken: mailbox name not allowed"
+#~ msgstr "Acción solicitada no realizada: nombre no permitido para mailbox"
+
+#~ msgid "Start mail input; end with <CRLF>.<CRLF>"
+#~ msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
+
+#~ msgid "Transaction failed"
+#~ msgstr "Falló en la transacción"
+
+#~ msgid "A password transition is needed"
+#~ msgstr "Es necesaria una transición de contraseña"
+
+#~ msgid "Authentication mechanism is too weak"
+#~ msgstr "El método de autenticación es demasiado débil"
+
+#~ msgid "Temporary authentication failure"
+#~ msgstr "Falló temporal en la autenticación"
+
+#~ msgid "Authentication required"
+#~ msgstr "Autenticación requerida"
+
+#~ msgid "Welcome response error"
+#~ msgstr "Error en la respuesta de bienvenida"
+
+#~ msgid "Failed to connect to SMTP server %s in secure mode: %s"
+#~ msgstr "Falló al conectar al servidor SMTP %s en modo seguro: %s"
+
+#~ msgid "server does not appear to support SSL"
+#~ msgstr "el servidor no parece soportar SSL"
+
+#~ msgid "STARTTLS command failed: %s"
+#~ msgstr "El comando STARTTLS ha fallado: %s"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "El comando STARTTLS ha fallado"
+
+#~ msgid "SMTP server %s does not support requested authentication type %s."
+#~ msgstr ""
+#~ "El servidor SMTP %s no implementa el método de autenticación requerido %s."
+
+#~ msgid "%sPlease enter the SMTP password for %s on host %s"
+#~ msgstr "%s Escriba la contraseña SMTP para %s en el host %s"
+
+#~ msgid ""
+#~ "Unable to authenticate to SMTP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "No se pudo autenticarme en el servidor SMTP.\n"
+#~ "%s\n"
+#~ "\n"
+
+#~ msgid "SMTP server %s"
+#~ msgstr "Servidor SMTP %s"
+
+#~ msgid "SMTP mail delivery via %s"
+#~ msgstr "Envío de correo SMTP vía %s"
+
+#~ msgid "Cannot send message: service not connected."
+#~ msgstr "No se pudo enviar el mensaje: servicio no conectado."
+
+#~ msgid "Cannot send message: sender address not valid."
+#~ msgstr "No se pudo enviar el mensaje: dirección del remitente no válida."
+
+#~ msgid "Cannot send message: no recipients defined."
+#~ msgstr "No se pudo enviar el mensaje: no hay destinatarios."
+
+#~ msgid "Cannot send message: one or more invalid recipients"
+#~ msgstr "No se pudo enviar el mensaje: uno o más destinatarios inválidos"
+
+#~ msgid "SMTP Greeting"
+#~ msgstr "Saludo del SMTP"
+
+#~ msgid "HELO command failed: %s"
+#~ msgstr "El comando HELO ha fallado: %s"
+
+#~ msgid "HELO command failed"
+#~ msgstr "El comando HELO ha fallado"
+
+#~ msgid "Error creating SASL authentication object."
+#~ msgstr "Error al crear el objeto de autenticación SASL."
+
+#~ msgid "AUTH command failed: %s"
+#~ msgstr "El comando AUTH ha fallado: %s"
+
+#~ msgid "AUTH command failed"
+#~ msgstr "El comando AUTH ha fallado"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "Respuesta de autenticación errónea desde el servidor.\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "El comando MAIL FROM ha fallado: %s: correo no enviado"
+
+#~ msgid "MAIL FROM command failed"
+#~ msgstr "El comando MAIL FROM ha fallado"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "El comando RCPT TO ha fallado: %s: correo no enviado"
+
+#~ msgid "RCPT TO <%s> failed"
+#~ msgstr "Falló RCPT TO <%s>"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "El comando DATA ha fallado: %s: correo no enviado"
+
+#~ msgid "DATA command failed"
+#~ msgstr "El comando DATA ha fallado"
+
+#~ msgid "RSET command failed: %s"
+#~ msgstr "El comando RSET ha fallado: %s"
+
+#~ msgid "RSET command failed"
+#~ msgstr "El comando RSET ha fallado"
+
+#~ msgid "QUIT command failed: %s"
+#~ msgstr "El comando QUIT ha fallado: %s"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "El comando QUIT ha fallado"
+
+#~ msgid "incoming"
+#~ msgstr "entrante"
+
+#~ msgid "outgoing"
+#~ msgstr "saliente"
+
+#~ msgid "Evolution Account Editor"
+#~ msgstr "Editor de cuentas de Evolution"
+
+#, fuzzy
+#~ msgid "Select individual file"
+#~ msgstr "Elija un archivo"
+
+#~ msgid "Receiving Mail"
+#~ msgstr "Recepción de correo"
+
+#~ msgid ""
+#~ "Please enter information about your incoming mail server below. If you "
+#~ "are not sure, ask your system administrator or Internet Service Provider."
+#~ msgstr ""
+#~ "Por favor rellene la información acerca del servidor de correo de "
+#~ "entrada. Si no está seguro, pregúntele a su administrador de sistemas o a "
+#~ "su Proveedor de Servicios de Internet."
+
+#~ msgid "Connecting to server..."
+#~ msgstr "Conectando al servidor..."
+
+#~ msgid "_Use Secure Connection (SSL):"
+#~ msgstr "U_sar conexión segura (SSL):"
+
+#~ msgid "C_ompleted"
+#~ msgstr "Terminad_o"
+
+#~ msgid "Close this item"
+#~ msgstr "Cerrar este elemento"
+
+#~ msgid "Delete this item"
+#~ msgstr "Borrar este elemento"
+
+#~ msgid "Preview the printed item"
+#~ msgstr "Previsualiza el elemento que va a ser impreso"
+
+#~ msgid "Print this item"
+#~ msgstr "Imprime este elemento"
+
+#~ msgid "Save the item and close the dialog box"
+#~ msgstr "Guarda el elemento y cierra la ventana de diálogo"
+
+#~ msgid "Save this item to disk"
+#~ msgstr "Guarda este elemento a disco"
+
+#~ msgid "Print En_velope..."
+#~ msgstr "Imprimir so_bre..."
+
+#~ msgid "Save the contact and close the dialog box"
+#~ msgstr "Guarda el contacto y cierra la ventana de diálogo"
+
+#~ msgid "Send _Message to Contact..."
+#~ msgstr "Enviar un _mensaje al contacto..."
+
+#~ msgid "Save the list and close the dialog box"
+#~ msgstr "Guarda la lista y cierra la ventana de diálogo"
+
+#~ msgid "Se_nd list to other..."
+#~ msgstr "E_nviar la lista a otros..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Borrar..."
+
+#~ msgid "Cancel Mee_ting"
+#~ msgstr "Cancelar reun_ión"
+
+#~ msgid "Cancel the meeting for this item"
+#~ msgstr "Cancela la reunión para este elemento"
+
+#~ msgid "Forward as i_Calendar"
+#~ msgstr "Reenviar como i_Calendar"
+
+#~ msgid "Forward this item via email"
+#~ msgstr "Reenvía este elemento por correo"
+
+#~ msgid "Obtain the latest meeting information"
+#~ msgstr "Obtiene la última información de la reunión"
+
+#~ msgid "Re_fresh Meeting"
+#~ msgstr "Actuali_zar reunión"
+
+#~ msgid "Schedule _Meeting"
+#~ msgstr "Concertar una _reunión"
+
+#~ msgid "Schedule a meeting for this item"
+#~ msgstr "Concierta una reunión para este elemento"
+
+#~ msgid "Assign Task"
+#~ msgstr "Asignar tarea"
+
+#~ msgid "Assign this task to others"
+#~ msgstr "Asignar esta tarea a otros"
+
+#~ msgid "Cancel Task"
+#~ msgstr "Cancelar tarea"
+
+#~ msgid "Cancel this task"
+#~ msgstr "Cancelar esta tarea"
+
+#~ msgid "Obtain the latest task information"
+#~ msgstr "Obtener la última información de la tarea"
+
+#~ msgid "Re_fresh Task"
+#~ msgstr "Ac_tualizar tarea"
+
+#~ msgid "Impossible internal error."
+#~ msgstr "Error interno imposible."
+
+#~ msgid "Failed to resolve host `%s': %s"
+#~ msgstr "Falló al resolver host «%s»: %s"
+
+#~ msgid "Failure in name lookup: %s"
+#~ msgstr "Error al resolver: %s"
+
+#~ msgid "Host lookup failed: cannot create thread: %s"
+#~ msgstr "La resolución del host ha fallado: no se puede crear el hilo: %s"
+
+#~ msgid "Host lookup failed: %s: host not found"
+#~ msgstr "Error al resolver el host: %s: host no encontrado"
+
+#~ msgid "Host lookup failed: %s: unknown reason"
+#~ msgstr "Error al resolver el host: %s: razón desconocida"
+
+#~ msgid "Host lookup failed: host not found"
+#~ msgstr "Error al resolver el host: host no encontrado"
+
+#~ msgid "Remove selected items from the attachment list"
+#~ msgstr "Quitar los elementos seleccionados de la lista de adjuntos"
+
+#~ msgid "Attach a file to the message"
+#~ msgstr "Adjuntar un archivo al mensaje"
+
+#~ msgid "<span weight=\"bold\">Checking for New Mail</span>"
+#~ msgstr "<span weight=\"bold\">Comprobación de correo nuevo</span>"
+
+#~ msgid "IMAPv4 "
+#~ msgstr "IMAPv4 "
+
+#~ msgid "Kerberos "
+#~ msgstr "Kerberos "
+
+#~ msgid "Qmail maildir "
+#~ msgstr "Maildir estilo Qmail"
+
+#~ msgid "Standard Unix mbox"
+#~ msgstr "Mailbox estándar de Unix"
+
 #~ msgid "*Control*F2"
 #~ msgstr "*Control*F2"
 
@@ -19719,12 +20029,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Only locations within starting point"
 #~ msgstr "Sólo las ubicaciones dentro del punto de inicio"
 
-#~ msgid "Search base only"
-#~ msgstr "Buscar en la base únicamente"
-
-#~ msgid "Search base:"
-#~ msgstr "Base de búsqueda:"
-
 #~ msgid "Search scope:"
 #~ msgstr "Ámbito de búsqueda: "
 
@@ -19828,9 +20132,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Co_nfidential"
 #~ msgstr "Co_nfidencial"
 
-#~ msgid "Date & Time"
-#~ msgstr "Fecha y hora"
-
 #~ msgid "F_ree"
 #~ msgstr "Lib_re"
 
@@ -19996,9 +20297,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "_Folder Name:"
 #~ msgstr "Nombre de la _carpeta:"
 
-#~ msgid "_User:"
-#~ msgstr "_Usuario:"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "No se pudo efectuar la consulta en la raíz DSE"
 
@@ -20037,9 +20335,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "S_earch scope: "
 #~ msgstr "Ámbito de bú_squeda: "
 
-#~ msgid "Searching"
-#~ msgstr "Búsqueda"
-
 #~ msgid "This option controls how long a search will be run."
 #~ msgstr ""
 #~ "Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
@@ -20098,15 +20393,9 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Can not load URI"
 #~ msgstr "No se pudo cargar la URI"
 
-#~ msgid "Calendar Properties"
-#~ msgstr "Propiedades de la agenda"
-
 #~ msgid "Remote"
 #~ msgstr "Remoto"
 
-#~ msgid "Task List Properties"
-#~ msgstr "Propiedades de lista de tareas"
-
 #~ msgid "_Refresh Interval:"
 #~ msgstr "Intervalo de _refresco:"
 
@@ -20158,9 +20447,6 @@ msgstr "%s (%d%% completado)"
 #~ "\n"
 #~ "¿Quiere guardar los cambios?"
 
-#~ msgid "_Discard Changes"
-#~ msgstr "_Descartar cambios"
-
 #~ msgid "Save Event"
 #~ msgstr "Guardar acontecimiento"
 
@@ -20180,15 +20466,9 @@ msgstr "%s (%d%% completado)"
 #~ msgstr ""
 #~ "La información de la tarea ha cambiado. ¿Enviar versión actualizada?"
 
-#~ msgid "The task backend for '%s' has crashed."
-#~ msgstr "El backend de tareas para %s se ha colgado."
-
 #~ msgid "The calendar backend for '%s' has crashed."
 #~ msgstr "El backend de la agenda para %s se ha colgado."
 
-#~ msgid "Posting not allowed by news server"
-#~ msgstr "Publicación no permitida por el servidor de noticias"
-
 #~ msgid "Failed to send newsgroups header: %s: message not posted"
 #~ msgstr ""
 #~ "Fallo al enviar la cabecera de los grupos de noticias: %s mensaje no "
@@ -20283,9 +20563,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Calendar file could not be updated!\n"
 #~ msgstr "El archivo de agenda no pudo ser actualizado\n"
 
-#~ msgid "Evolution Calendar viewer"
-#~ msgstr "Visor de la agenda de Evolution"
-
 #~ msgid "Evolution Tasks viewer"
 #~ msgstr "Visor de tareas de Evolution"
 
@@ -20431,9 +20708,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "_General"
 #~ msgstr "_General"
 
-#~ msgid "calendar"
-#~ msgstr "agenda"
-
 #~ msgid ""
 #~ "The task backend for\n"
 #~ "%s\n"
@@ -20607,13 +20881,6 @@ msgstr "%s (%d%% completado)"
 #~ msgstr "Error accediendo al archivo: %s"
 
 #~ msgid ""
-#~ "Unable to seek on file: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No se pudo buscar en el archivo: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Unable to truncate file: %s\n"
 #~ "%s"
 #~ msgstr ""
@@ -20929,9 +21196,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "_Address Book"
 #~ msgstr "Libreta de direcciones"
 
-#~ msgid "The view showing when the calendar starts"
-#~ msgstr "La vista mostrando cuándo empieza la agenda"
-
 #~ msgid "_Task List"
 #~ msgstr "Lista de _tareas"
 
@@ -21011,18 +21275,12 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Edit VFolders"
 #~ msgstr "Editar carpeta virtual"
 
-#~ msgid "Outgoing"
-#~ msgstr "Saliente"
-
 #~ msgid "[script]"
 #~ msgstr "[script]"
 
 #~ msgid "_Search for Contacts"
 #~ msgstr "Bu_scar contactos"
 
-#~ msgid "Go to _Date"
-#~ msgstr "Ir a una _fecha"
-
 #~ msgid "Go to today"
 #~ msgstr "Ir a hoy"
 
@@ -21050,9 +21308,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "1 second"
 #~ msgstr "1 segundo"
 
-#~ msgid "Description"
-#~ msgstr "Descripción"
-
 #~ msgid "component"
 #~ msgstr "componente"
 
@@ -21310,9 +21565,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "No data provided"
 #~ msgstr "No se proporcionaron datos"
 
-#~ msgid "Print Summary"
-#~ msgstr "Imprimir resumen"
-
 #~ msgid "Print summary"
 #~ msgstr "Imprimir resumen"
 
@@ -21816,12 +22068,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Add a Folder"
 #~ msgstr "Añadir una carpeta"
 
-#~ msgid "Outbox"
-#~ msgstr "Bandeja de salida"
-
-#~ msgid "Sent"
-#~ msgstr "Correo enviado"
-
 #~ msgid ""
 #~ "Error synchronizing \"%s\":\n"
 #~ "%s"
@@ -21850,9 +22096,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "A folder with the same name already exists"
 #~ msgstr "Ya existe una carpeta con ese nombre"
 
-#~ msgid "The specified folder type is not valid"
-#~ msgstr "Es tipo de archivo especificado no es válido"
-
 #~ msgid "I/O error"
 #~ msgstr "Error de E/S"
 
@@ -21934,9 +22177,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Create a new all-day event"
 #~ msgstr "Crear una evento nuevo para todo el día"
 
-#~ msgid "New _Appointment"
-#~ msgstr "Cit_a nueva"
-
 #~ msgid "New _Meeting"
 #~ msgstr "_Reunión nueva"
 
@@ -21949,9 +22189,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Toggle"
 #~ msgstr "Cambiar"
 
-#~ msgid "Clear"
-#~ msgstr "Vaciar"
-
 #~ msgid "e_book_cancel: there is no current operation"
 #~ msgstr "e_book_cancel: no hay operación actual"
 
@@ -22012,9 +22249,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "List Show Addresses"
 #~ msgstr "Mostrar direcciones de la lista"
 
-#~ msgid "Evolution LDIF importer factory"
-#~ msgstr "Fábrica del importador de LDIF de Evolution"
-
 #~ msgid "Searching..."
 #~ msgstr "Buscando..."
 
@@ -22491,9 +22725,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Copy message(s) to"
 #~ msgstr "Copiar mensaje(s) a"
 
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr "¿Seguro que quiere editar los %d mensajes?"
-
 #~ msgid ""
 #~ "You may only edit messages saved\n"
 #~ "in the Drafts folder."
@@ -22536,21 +22767,12 @@ msgstr "%s (%d%% completado)"
 #~ "El archivo «%s» ya existe.\n"
 #~ "¿Quiere que lo sobreescriba?"
 
-#~ msgid "Save Attachment"
-#~ msgstr "Guardar adjunto"
-
-#~ msgid "Save Attachment..."
-#~ msgstr "Guardar adjunto..."
-
 #~ msgid "View Inline (via %s)"
 #~ msgstr "Ver incluido (vía %s)"
 
 #~ msgid "External Viewer"
 #~ msgstr "Visores externos"
 
-#~ msgid "Downloading images"
-#~ msgstr "Descargando imágenes"
-
 #~ msgid "Loading message content"
 #~ msgstr "Cargando el contenido del mensaje"
 
@@ -22625,9 +22847,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Subscribing to folder \"%s\""
 #~ msgstr "Suscribiendo a carpeta «%s»"
 
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "Desuscribiendo la carpeta «%s»"
-
 #~ msgid "Scanning folders ..."
 #~ msgstr "Analizando carpetas..."
 
@@ -23099,9 +23318,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Ayacucho"
 #~ msgstr "Ayacucho"
 
-#~ msgid "Bage"
-#~ msgstr "Bage"
-
 #~ msgid "Bagotville"
 #~ msgstr "Bagotville"
 
@@ -24890,9 +25106,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Gadsden"
 #~ msgstr "Gadsden"
 
-#~ msgid "Gage"
-#~ msgstr "Gage"
-
 #~ msgid "Gainesville"
 #~ msgstr "Gainesville"
 
@@ -26681,9 +26894,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Missouri"
 #~ msgstr "Missouri"
 
-#~ msgid "Mitchell"
-#~ msgstr "Mitchell"
-
 #~ msgid "Mitilini"
 #~ msgstr "Mitilini"
 
@@ -28937,9 +29147,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Takamatsu Airport"
 #~ msgstr "Aeropuerto de Takamatsu"
 
-#~ msgid "Talara"
-#~ msgstr "Talara"
-
 #~ msgid "Talkeetna"
 #~ msgstr "Talkeetna"
 
@@ -29018,9 +29225,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Tela"
 #~ msgstr "Tela"
 
-#~ msgid "Temple"
-#~ msgstr "Temple"
-
 #~ msgid "Tennessee"
 #~ msgstr "Tennessee"
 
@@ -29570,9 +29774,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Waterloo"
 #~ msgstr "Waterloo"
 
-#~ msgid "Watertown"
-#~ msgstr "Watertown"
-
 #~ msgid "Waterville"
 #~ msgstr "Waterville"
 
@@ -29747,9 +29948,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Worcester"
 #~ msgstr "Worcester"
 
-#~ msgid "Worland"
-#~ msgstr "Worland"
-
 #~ msgid "Worthington"
 #~ msgstr "Worthington"
 
@@ -29933,9 +30131,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "KBOS"
 #~ msgstr "LEMD:LEVS:LEVC"
 
-#~ msgid "%A, %B %e %Y"
-#~ msgstr "%A, %e de %B de %Y"
-
 #~ msgid "Please wait..."
 #~ msgstr "Por favor espere..."
 
@@ -30320,9 +30515,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Blowing small hail"
 #~ msgstr "Granizada con viento leve"
 
-#~ msgid "Showers of small hail"
-#~ msgstr "Granizo con lluvia"
-
 #~ msgid "Drifting small hail"
 #~ msgstr "Granizada cambiando"
 
@@ -30974,9 +31166,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Evolution Mail font configuration control"
 #~ msgstr "Control de configuración de tipografía del correo de Evolution"
 
-#~ msgid "Font Preferences"
-#~ msgstr "Preferencias de tipografías"
-
 #~ msgid "Add a news feed"
 #~ msgstr "Añadir una fuente de noticias"
 
@@ -31010,9 +31199,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "S_elect server: "
 #~ msgstr "S_eleccionar servidor:"
 
-#~ msgid "Add"
-#~ msgstr "Añadir"
-
 #~ msgid "_Signature editor"
 #~ msgstr "Editor de _firmas"
 
@@ -31194,9 +31380,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Add (or Edit) Attribute Mappings"
 #~ msgstr "Añadir (o Editar) Atributos de Planificación"
 
-#~ msgid "DN Customization"
-#~ msgstr "Personalización de ND"
-
 #~ msgid "Mappings"
 #~ msgstr "Planes"
 
@@ -31255,9 +31438,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "_Edit Mapping"
 #~ msgstr "_Editar plan"
 
-#~ msgid "_Evolution attribute:"
-#~ msgstr "Atributo de _Evolution:"
-
 #~ msgid "_If necessary "
 #~ msgstr "Si es _necesario"
 
@@ -31329,9 +31509,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Can't call getFolderAtPath on storage: %s"
 #~ msgstr "No se pudo llamar a getFolderAtPath en el almacén: %s"
 
-#~ msgid "minute"
-#~ msgstr "minuto"
-
 #~ msgid "hour"
 #~ msgstr "hora"
 
@@ -31407,9 +31584,6 @@ msgstr "%s (%d%% completado)"
 #~ msgstr ""
 #~ "No se pudo iniciar la interfaz del Asistente de Correo de Evolution\n"
 
-#~ msgid "Folder name cannot contain slashes."
-#~ msgstr "El nombre de la carpeta no puede contener el carácter «/»."
-
 #~ msgid "Host"
 #~ msgstr "Host"
 
@@ -31424,3 +31598,4 @@ msgstr "%s (%d%% completado)"
 
 #~ msgid "th"
 #~ msgstr "º"
+
author	Francisco Javier F. Serrador <serrador@cvs.gnome.org>	2005-01-21 01:04:53 +0800
committer	Francisco Javier Fernandez Serrador <serrador@src.gnome.org>	2005-01-21 01:04:53 +0800
commit	a50635be1f2aa13eabd81d435bfe2057d30fa0e0 (patch)
tree	2626e1d7b753d79000f44a7385c9bb76f775142d /po/es.po
parent	a7f9e241e7483e125921ad10b5aaa01ddbc85b52 (diff)
download	gsoc2013-evolution-a50635be1f2aa13eabd81d435bfe2057d30fa0e0.tar.gz gsoc2013-evolution-a50635be1f2aa13eabd81d435bfe2057d30fa0e0.tar.zst gsoc2013-evolution-a50635be1f2aa13eabd81d435bfe2057d30fa0e0.zip