Updated Spanish translation.

2004-05-04 Francisco Javier F. Serrador <serrador@cvs.gnome.org> * es.po: Updated Spanish translation. svn path=/trunk/; revision=25780
author: Francisco Javier F. Serrador <serrador@cvs.gnome.org> 2004-05-04 18:25:31 +0800
committer: Francisco Javier Fernandez Serrador <serrador@src.gnome.org> 2004-05-04 18:25:31 +0800
commit: 8028fcb3d7d92b82e613c366e111465967b2811a (patch)
tree: b3994db736ddcfa4610a5ee6ec8e8ac29ddef503 /po
parent: ddc0dc65f57f8a01f2744becf35a08eb4ef8e848 (diff)
download: gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar
gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar.gz
gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar.bz2
gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar.lz
gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar.xz
gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar.zst
gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.zip
2 files changed, 2764 insertions, 2649 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 5e9b02dcc2..01f7d06310 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-04  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spansih translation.
+
 2004-05-03  Gareth Owen  <gowen72@yahoo.com>
 
 	* en_GB.po: Updated British English translation
diff --git a/po/es.po b/po/es.po
index 3d6b68eea6..2476912d82 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,14 +14,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
-"PO-Revision-Date: 2004-04-24 21:59+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-04 11:21+0200\n"
+"PO-Revision-Date: 2004-05-04 12:24+0200\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"
-"Report-Msgid-Bugs-To: \n"
 "serrador@hispalinux.es>\n"
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
@@ -32,6 +32,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "libreta de direcciones de Evolution"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "cabecera del contacto: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "minitarjeta de Evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "carpeta de libretas de direcciones actual"
@@ -52,14 +60,6 @@ msgstr "tarjetas"
 msgid " card"
 msgstr "tarjeta"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "cabecera del contacto: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "minitarjeta de Evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Dirección de sincr. predeterminada:"
@@ -74,63 +74,20 @@ msgstr "No se pudo cargar la libreta de direcciones"
 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 "Certificates"
-msgstr "Certificados"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Configure el autocompletado aquí"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-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:7
-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:8
-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:9
-msgid "Evolution Addressbook component"
-msgstr "Componente de libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visor de carpetas de la 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/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accediendo al servidor LDAP anónimamente"
 
-#: 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:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Falló al autenticarme.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Gestione sus certificados S/Mime aquí"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, 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:93
 msgid "New Contact"
@@ -168,31 +125,31 @@ msgstr "Grupo de _contactos"
 msgid "Create a new contacts group"
 msgstr "Crea un grupo de contactos nuevo"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-config.c:463
 msgid "Failed to connect to LDAP server"
 msgstr "Falló al conectarse al servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:490
+#: addressbook/gui/component/addressbook-config.c:487
 msgid "Failed to authenticate with LDAP server"
 msgstr "Falló al autenticarse con el servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:515
 msgid "Could not perform query on Root DSE"
 msgstr "No se pudo efectuar la consulta en la raíz DSE"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:820
 msgid "The server responded with no supported search bases"
 msgstr "El servidor respondió con bases de búsqueda no soportadas"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Este servidor no soporta el esquema de información LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1241
 msgid "Error retrieving schema information"
 msgstr "Error al obtener información del esquema"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: addressbook/gui/component/addressbook-config.c:1249
 msgid "Server did not respond with valid schema information"
 msgstr "El servidor no respondió con una información del esquema válida"
 
@@ -208,18 +165,22 @@ msgid "Migrating `%s':"
 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:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/mail-component.c:243
 msgid "On This Computer"
 msgstr "En este equipo"
 
 #. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Privado"
@@ -260,41 +221,69 @@ msgstr ""
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
 #: addressbook/gui/component/addressbook-migrate.c:1099
-#, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"La forma en que evolution almacena algunos números de teléfono ha cambiado.\n"
+"La forma en que Evolution almacena algunos números de teléfono ha cambiado.\n"
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
 #: addressbook/gui/component/addressbook-migrate.c:1109
-#, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
-"La forma en que evolution almacena algunos números de teléfono ha cambiado.\n"
+"El registro de cambios y los archivos de mapas de Palm de Evolution han cambiado.\n"
 "\n"
-"Tenga paciencia mientras Evolution migra sus carpetas..."
+"Tenga paciencia mientras Evolution migra sus datos Pilot Sync..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accediendo al servidor LDAP anónimamente"
+#: addressbook/gui/component/addressbook-view.c:687
+#, 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.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Falló al autenticarme.\n"
+#: addressbook/gui/component/addressbook-view.c:774
+msgid "New Address Book"
+msgstr "Libreta de direcciones nueva"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, 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:775
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
+#: filter/libfilter-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-tasks.xml.h:6
+msgid "Delete"
+msgstr "Borrar"
+
+#: addressbook/gui/component/addressbook-view.c:776
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+msgid "Properties..."
+msgstr "Propiedades..."
+
+#: addressbook/gui/component/addressbook-view.c:1001
+msgid "UID of the contacts source that the view will display"
+msgstr "UID de la fuente de contactos que la vista mostrará"
+
+#: addressbook/gui/component/addressbook-view.c:1006
+msgid "The URI that the address book will display"
+msgstr "La URI que mostrará la libreta de direcciones"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:1031
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contactos"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -318,6 +307,54 @@ 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 "Certificates"
+msgstr "Certificados"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure autocomplete here"
+msgstr "Configure el autocompletado aquí"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+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:7
+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:8
+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:9
+msgid "Evolution Addressbook component"
+msgstr "Componente de libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visor de carpetas de la 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 "Manager your S/Mime certificates here"
+msgstr "Gestione sus certificados S/Mime aquí"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr " Mo_strar bases soportadas "
@@ -339,13 +376,14 @@ msgstr " Mo_strar bases soportadas "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
 #: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1:00"
@@ -372,45 +410,38 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-#, fuzzy
 msgid "<b>Authentication</b>"
-msgstr "Autenticación"
+msgstr "<b>Autenticación</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
 msgid "<b>Display</b>"
-msgstr "<b>correo-e</b>"
+msgstr "<b>Pantalla</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
 msgid "<b>Downloading</b>"
-msgstr "<b>Envío de correo:</b>"
+msgstr "<b>Descarga</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
 msgid "<b>Searching</b>"
-msgstr "<b>_Selección</b>"
+msgstr "<b>Búsqueda</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:14
-#, fuzzy
 msgid "<b>Server Information</b>"
-msgstr "Paso 2: Información del servidor"
+msgstr "<b>Información del servidor</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
-#, fuzzy
 msgid "<b>Type:</b>"
-msgstr "<b>Entonces</b>"
+msgstr "<b>Tipo:</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
-#, fuzzy
 msgid "Add Contacts Group"
-msgstr "Grupo de _contactos"
+msgstr "Añadir grupo de contactos"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Siempre"
@@ -425,106 +456,88 @@ msgid "Basic"
 msgstr "Básico"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_olor:"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Conexión"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "_Nombre distintivo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
-msgstr "_Nombre distintivo:"
+msgstr "Nombre distintivo"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
-msgstr "Límite de _descarga:"
+msgstr "Límite de descarga:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Email address"
-msgstr "Dirección de correo-e:"
+msgstr "Dirección de correo-e"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Dirección de correo-e:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution usará este Nombre Distintivo para autenticarle con el servidor"
+msgstr "Evolution usará este Nombre Distintivo para autenticarle con el servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
-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:29
+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:31
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
-msgstr "Bases de búsqueda soportadas"
+msgstr "Encontrar bases de búsqueda posibles"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nunca"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Uno"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Elija un color"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Ámbito de bú_squeda: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Search base only"
-msgstr "Base de búsqueda:"
+msgstr "Buscar en la base únicamente"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Base de búsqueda:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid "Search scope:"
-msgstr "Ámbito de bú_squeda: "
+msgstr "Ámbito de búsqueda: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Búsqueda"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -534,7 +547,7 @@ msgstr ""
 "servidores LDAP si\n"
 "sus servidores LDAP soportan SSL o TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -550,7 +563,7 @@ msgstr ""
 "cortafuegos en el trabajo, entonces Evolution no necesita usar SSL/TLS "
 "porque su conexión ya es segura."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -563,19 +576,19 @@ msgstr ""
 "significa que su conexión será insegura y que usted será vulnerable a fallos "
 "de seguridad. "
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
-msgstr ""
+msgstr "Punto de inicio y ubicaciones dentro de él"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Bases de búsqueda soportadas"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -587,7 +600,7 @@ msgstr ""
 "Si deja esto en blanco, la búsqueda empezará en la raíz del árbol de "
 "directorios."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -604,7 +617,7 @@ msgstr ""
 "las entradas \n"
 "un nivel bajo su base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -612,7 +625,7 @@ msgstr ""
 "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.micompañia."
 "com»."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -621,7 +634,7 @@ msgstr ""
 "Este es el máximo número de entradas para descargar.  Si pone este número\n"
 "demasiado alto ralentizará su libreta de direcciones."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -631,7 +644,7 @@ msgstr ""
 "establecer esto a «Dirección de Correo-e» requiere acceso anónimo a su "
 "servidor ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -641,7 +654,7 @@ msgstr ""
 "Evolution.\n"
 "Es sólo para poder mostrarlo en pantalla. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -653,130 +666,129 @@ msgstr ""
 "administrador del\n"
 "sistema qué puerto debería especificar."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:67
 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."
+msgstr "Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Timeout:"
-msgstr "Formato de la hora:"
+msgstr "Tiempo de expiración:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "U_sar SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Usando Nombre Distintivo (ND)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "_Add Contacts Group"
-msgstr "Grupo de _contactos"
+msgstr "_Añadir grupo de contactos"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:74
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "_Display name:"
 msgstr "_Mostrar nombre:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid "_Email address:"
-msgstr "Dirección de correo-e:"
+msgstr "Dirección de _correo-e:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Método de _inicio de sesión:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "Número de _puerto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "_Port:"
-msgstr "_Prioridad:"
+msgstr "_Puerto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "Base de _búsqueda:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Nombre del _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "_Server:"
-msgstr "S_ervidor:"
+msgstr "_Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Tiempo de expiración (minutos):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
-msgstr "U_sar conexión segura (SSL):"
+msgstr "_Usar conexión segura:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "tarjetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "Conexión"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/alarm-options.glade.h:14
 #: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:182
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "búsqueda"
 
-#: 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.c:497
+#: 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/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Eliminar"
 
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.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-popup.c:208
+msgid "Remove All"
+msgstr "Eliminar todo"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Ver lista de contactos"
@@ -799,22 +811,15 @@ msgstr "Añadir a contactos"
 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:222
 msgid "Source"
 msgstr "Fuente"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/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/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -873,7 +878,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Trabajo</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #: addressbook/gui/widgets/eab-contact-display.c:302
 #: addressbook/gui/widgets/eab-contact-display.c:321
 msgid "AIM"
@@ -917,7 +922,7 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -925,7 +930,7 @@ msgid "Contact"
 msgstr "Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1447
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -946,8 +951,8 @@ msgid "Full _Name..."
 msgstr "_Nombre completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/e-contact-editor.c:198
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Domicilio"
 
@@ -987,8 +992,8 @@ msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor.c:199
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Otro"
 
@@ -1014,9 +1019,9 @@ msgstr "Webcam:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Trabajo"
@@ -1045,6 +1050,22 @@ msgstr "item7"
 msgid "item8"
 msgstr "item8"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+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:319
+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:311
 #: addressbook/gui/widgets/eab-contact-display.c:332
@@ -1052,16 +1073,16 @@ msgid "Address"
 msgstr "Dirección"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 #: 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:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Editable"
 
@@ -2033,91 +2054,91 @@ 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.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
 #: addressbook/gui/widgets/eab-contact-display.c:305
 #: addressbook/gui/widgets/eab-contact-display.c:324
 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-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-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:2
-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:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:307
 #: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
 #: addressbook/gui/widgets/eab-contact-display.c:306
 #: addressbook/gui/widgets/eab-contact-display.c:325
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:304
+#: addressbook/gui/widgets/eab-contact-display.c:323
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Source Book"
 msgstr "Libro fuente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Target Book"
 msgstr "Libro destino"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 msgid "Is New Contact"
 msgstr "Es un contacto nuevo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 msgid "Changed"
 msgstr "Modificados"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1661
 msgid "Category editor not available."
 msgstr "No hay un editor de categorías disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1669
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertenece a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#: addressbook/gui/contact-editor/e-contact-editor.c:2516
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No se pudo encontrar el widget para el campo: «%s»"
 
+#: 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:578
+#: calendar/gui/e-cal-list-view.etspec.h:2
+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-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Añadir contacto rápido"
@@ -2135,22 +2156,6 @@ msgstr "Nombre _completo:"
 msgid "E-_mail:"
 msgstr "_Correo-e:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-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:319
-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:"
@@ -2286,8 +2291,7 @@ msgstr "_Nombre de la lista:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 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:"
+msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
@@ -2297,8 +2301,8 @@ msgstr "Editor de lista de contactos"
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:215
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Libro"
 
@@ -2359,417 +2363,6 @@ msgstr ""
 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:229
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:467
-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:161
-msgid "Name begins with"
-msgstr "El nombre empieza por"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:162
-msgid "Email begins with"
-msgstr "El correo-e empieza por"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
-msgid "Category is"
-msgstr "La categoría es"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
-msgid "Any field contains"
-msgstr "Cualquier campo contiene"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Advanced..."
-msgstr "Avanzado..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:236
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Tipo"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:506
-msgid "Address Book"
-msgstr "Libreta de direcciones"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "Guardar como VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
-msgid "New Contact..."
-msgstr "Contacto nuevo..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-msgid "New Contact List..."
-msgstr "Lista de contactos nueva..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-msgid "Go to Folder..."
-msgstr "Ir a la carpeta..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
-msgid "Import..."
-msgstr "Importar..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
-msgid "Search for Contacts..."
-msgstr "Buscar contactos..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
-msgid "Address Book Sources..."
-msgstr "Fuentes de la libreta de direcciones..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-msgid "Pilot Settings..."
-msgstr "Configuración del Pilot..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Reenviar contacto"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-msgid "Send Message to Contact"
-msgstr "Envía un mensaje al contacto"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 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:1075
-msgid "Print Envelope"
-msgstr "Imprimir sobre"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
-msgid "Copy to Address Book..."
-msgstr "Copiar a la libreta de direcciones..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
-msgid "Move to Address Book..."
-msgstr "Mover a la libreta de direcciones..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Cortar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
-#: 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:1085
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Pegar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: filter/libfilter-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-tasks.xml.h:6
-msgid "Delete"
-msgstr "Borrar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
-msgid "Current View"
-msgstr "Vista actual"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"El soporte de la libreta de direcciones para\n"
-"%s\n"
-"se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
-#: calendar/gui/cal-search-bar.c:362
-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
-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:512 smime/lib/e-cert.c:774
-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:331
-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:342
-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:300
-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:256
-#: 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:142
-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:145
-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:453
-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:114
 #: addressbook/gui/widgets/eab-contact-display.c:177
 msgid "(map)"
@@ -2789,6 +2382,11 @@ msgstr "Listar miembros"
 msgid "E-mail"
 msgstr "Correo-e"
 
+#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organización"
+
 #: addressbook/gui/widgets/eab-contact-display.c:301
 msgid "Position"
 msgstr "Posición"
@@ -2824,14 +2422,30 @@ msgstr "WWW"
 msgid "Blog"
 msgstr "Blog"
 
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Teléfono móvil"
+
 #: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "personal"
 msgstr "personal"
 
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Nota"
+
 #: addressbook/gui/widgets/eab-contact-display.c:508
 msgid "Job Title"
 msgstr "Puesto"
 
+#: addressbook/gui/widgets/eab-contact-display.c:512
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Correo-e"
+
 #: addressbook/gui/widgets/eab-contact-display.c:539
 msgid "Home page"
 msgstr "Página personal"
@@ -2887,8 +2501,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-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
+#: calendar/gui/e-cal-model-tasks.c:626 calendar/gui/print.c:2349
 #: camel/camel-service.c:728 camel/camel-service.c:766
 #: camel/camel-service.c:850 camel/camel-service.c:890
 #: camel/providers/pop3/camel-pop3-store.c:451
@@ -2993,13 +2608,11 @@ msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:173
 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:176
 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:179
 msgid "This query did not complete successfully."
@@ -3018,7 +2631,7 @@ msgid "Error adding list"
 msgstr "Error añadiendo lista"
 
 #: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
+#: addressbook/gui/widgets/eab-gui-util.c:651
 msgid "Error adding contact"
 msgstr "Error añadiendo contacto"
 
@@ -3035,7 +2648,7 @@ msgid "Error removing list"
 msgstr "Error eliminando lista"
 
 #: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
+#: addressbook/gui/widgets/eab-gui-util.c:609
 msgid "Error removing contact"
 msgstr "Error eliminando contacto"
 
@@ -3071,35 +2684,35 @@ msgstr "Error guardando %s: %s"
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:569
+#: addressbook/gui/widgets/eab-gui-util.c:570
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: addressbook/gui/widgets/eab-gui-util.c:705
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:707
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:709
+#: addressbook/gui/widgets/eab-gui-util.c:710
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:712
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: addressbook/gui/widgets/eab-gui-util.c:715
 msgid "Select target addressbook."
 msgstr "Seleccione la libreta de direcciones destino."
 
-#: addressbook/gui/widgets/eab-gui-util.c:887
+#: addressbook/gui/widgets/eab-gui-util.c:888
 msgid "Multiple VCards"
 msgstr "VCards múltiples"
 
-#: addressbook/gui/widgets/eab-gui-util.c:890
+#: addressbook/gui/widgets/eab-gui-util.c:891
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -3117,6 +2730,16 @@ msgstr "(ninguno)"
 msgid "Primary Email"
 msgstr "Correo-e principal"
 
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Correo-e 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Correo-e 3"
+
 #: addressbook/gui/widgets/eab-popup-control.c:568
 msgid "Select an Action"
 msgstr "Seleccione una acción"
@@ -3163,6 +2786,377 @@ msgstr "Mostrar VCard compacta"
 msgid "Save in addressbook"
 msgstr "Guardar en la libreta de direcciones"
 
+#: 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:229
+#: addressbook/gui/widgets/e-minicard-view.c:467
+#: 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: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:161
+msgid "Name begins with"
+msgstr "El nombre empieza por"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:162
+msgid "Email begins with"
+msgstr "El correo-e empieza por"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: calendar/gui/cal-search-bar.c:57
+msgid "Category is"
+msgstr "La categoría es"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: calendar/gui/cal-search-bar.c:50
+msgid "Any field contains"
+msgstr "Cualquier campo contiene"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Advanced..."
+msgstr "Avanzado..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Tipo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:506
+msgid "Address Book"
+msgstr "Libreta de direcciones"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard"
+msgstr "Guardar como VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
+msgid "New Contact..."
+msgstr "Contacto nuevo..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+msgid "New Contact List..."
+msgstr "Lista de contactos nueva..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
+msgid "Go to Folder..."
+msgstr "Ir a la carpeta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
+msgid "Import..."
+msgstr "Importar..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
+msgid "Search for Contacts..."
+msgstr "Buscar contactos..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
+msgid "Address Book Sources..."
+msgstr "Fuentes de la libreta de direcciones..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
+msgid "Pilot Settings..."
+msgstr "Configuración del Pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Reenviar contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+msgid "Send Message to Contact"
+msgstr "Envía un mensaje al contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 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:1075
+msgid "Print Envelope"
+msgstr "Imprimir sobre"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
+msgid "Copy to Address Book..."
+msgstr "Copiar a la libreta de direcciones..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
+msgid "Move to Address Book..."
+msgstr "Mover a la libreta de direcciones..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: 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:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Pegar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1279
+msgid "Current View"
+msgstr "Vista actual"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1309
+#, c-format
+msgid ""
+"The addressbook backend for\n"
+"%s\n"
+"has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+"El soporte de la libreta de direcciones para\n"
+"%s\n"
+"se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: calendar/gui/cal-search-bar.c:362
+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
+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:256
+#: 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.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:142
+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:145
+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:453
+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:24
 msgid "Card View"
 msgstr "Vista de la tarjeta"
@@ -3171,17 +3165,17 @@ msgstr "Vista de la tarjeta"
 msgid "GTK Tree View"
 msgstr "Vista de árbol GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
 msgid "Reflow Test"
 msgstr "Test de reflujo"
 
-#: addressbook/gui/widgets/test-reflow.c:107
+#: 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:109
+#: 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"
 
@@ -3205,11 +3199,6 @@ msgstr "Importador de VCard de Evolution"
 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:998
 msgid "Print contacts"
 msgstr "Imprimir contactos"
@@ -3219,6 +3208,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."
@@ -3403,16 +3397,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:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
-msgid "Can not open file"
-msgstr "No se pudo abrir el archivo"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "No se pudo cargar la URI"
-
 #: 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"
@@ -3438,8 +3422,7 @@ 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."
@@ -3449,8 +3432,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."
@@ -3471,6 +3453,16 @@ msgstr "En modo normal, no hay necesidad de la opción de tamaño."
 msgid "Impossible internal error."
 msgstr "Error interno imposible."
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+msgid "Can not open file"
+msgstr "No se pudo abrir el archivo"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+msgid "Can not load URI"
+msgstr "No se pudo cargar la URI"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Error cargando la libreta de direcciones predeterminada."
@@ -3483,11 +3475,12 @@ msgstr "Archivo de entrada"
 msgid "No filename provided."
 msgstr "No ha especificado un nombre de archivo."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Lista de anónimos"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Introduzca contraseña"
 
@@ -3519,99 +3512,35 @@ 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 "Agenda y tareas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Agendas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure su zona horaria, Agenda y Lista de Tareas aquí"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Agenda y Tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Control de configuración de la agenda 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 de la agenda de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Visor de la agenda de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de agenda/tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Visor de tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Componente de Agenda de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Componente de Tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tareas"
-
-#: 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 de la Agenda de Evolution"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Inicio:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Finalización:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Alarma de Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: 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:1
-#: 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"
+msgid "Snooze _time (minutes):"
+msgstr "_Posponer el aviso (minutos):"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "_Posponer"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
-msgstr "Posponer el aviso (minutos)"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "_Snooze"
+msgstr "_Posponer"
+
 #: calendar/gui/alarm-notify/alarm-queue.c:873
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
@@ -3680,6 +3609,10 @@ msgstr ""
 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 de la Agenda de Evolution"
+
 #: calendar/gui/alarm-notify/notify-main.c:164
 msgid "Could not initialize Bonobo"
 msgstr "No se pudo inicializar Bonobo"
@@ -3810,40 +3743,19 @@ msgstr "Indica si debe ocultar las áreas terminadas"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 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:30
 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:31
 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"
+msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "El resumen contiene"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "La descripción contiene"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "El comentario contiene"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "La ubicación contiene"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "No coincidente"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: calendar/gui/calendar-commands.c:116 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/gnome-cal.c:1706
 #: camel/providers/groupwise/camel-gw-listener.c:304
 #: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Calendar"
@@ -3869,58 +3781,62 @@ msgstr "Purgar eventos anteriores a"
 msgid "days"
 msgstr "días"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:431 calendar/gui/calendar-component.c:504
 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.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#. 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:434 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view.c:1589 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
 #: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a, %d de %b de %Y"
 
 #: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
 #: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 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:464
+#: calendar/gui/calendar-commands.c:464 calendar/gui/calendar-component.c:533
 #: 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:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "La Agenda «%s» será eliminada. ¿Seguro que quiere continuar?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Agenda nueva"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Propiedades..."
-
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:908
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "no se pudo abrir la agenda «%s» para crear eventos y reuniones"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:920
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay una agenda disponible para crear eventos y reuniones"
 
-#: calendar/gui/calendar-component.c:836
+#: calendar/gui/calendar-component.c:954
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -3928,51 +3844,56 @@ msgstr ""
 "La agenda selaccionada es de sólo lectura, no pueden crearse eventos. Por "
 "favor, seleccione una agenda de lectura-escritura."
 
-#: calendar/gui/calendar-component.c:1095
+#: calendar/gui/calendar-component.c:1062
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr "Agendas"
+
+#: calendar/gui/calendar-component.c:1225
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1226
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1227
 msgid "Create a new appointment"
 msgstr "Crear una cita nueva"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1233
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1234
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1235
 msgid "Create a new meeting request"
 msgstr "Crear una solicitud de reunión nueva"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1241
 msgid "New all day appointment"
 msgstr "Cita para todo el día nueva"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1242
 msgid "All _Day Appointment"
 msgstr "Cita para todo el _día"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1243
 msgid "Create a new all-day appointment"
 msgstr "Crear una cita nueva para todo el día"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1249
 msgid "New calendar"
 msgstr "Agenda nueva"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1250
 msgid "C_alendar"
 msgstr "_Agenda"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1251
 msgid "Create a new calendar"
 msgstr "Crear una agenda nueva"
 
@@ -4002,6 +3923,26 @@ msgstr "Vista semanal"
 msgid "Month View"
 msgstr "Vista mensual"
 
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "El resumen contiene"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "La descripción contiene"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "El comentario contiene"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "La ubicación contiene"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "No coincidente"
+
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Error al abrir la agenda"
@@ -4138,6 +4079,7 @@ msgstr "Enviar un correo-e"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-cal-component-preview.c:187
 #: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
@@ -4176,10 +4118,98 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "comienzo de cita"
 
+#: calendar/gui/dialogs/calendar-setup.c:166
+msgid "You must specify a location to get the calendar from."
+msgstr "Debe especificar una ubicación de la que obtener la agenda."
+
+#: calendar/gui/dialogs/calendar-setup.c:174
+#, 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:189
+#, 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:234
+#, 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:247
+#, 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 la "
+"agenda"
+
+#: 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 Tasks Group"
+msgstr "Añadir grupo de tareas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "C_olor:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+msgid "Calendar Properties"
+msgstr "Propiedades de la agenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Elija un color"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
+msgid "Remote"
+msgstr "Remoto"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "Task List Properties"
+msgstr "Propiedades de lista de tareas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Add Calendar"
+msgstr "_Añadir Calendario"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_Add Group"
+msgstr "_Añadir grupo"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+msgid "_Refresh Interval:"
+msgstr "Intervalo de _refresco:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+msgid "_Refresh:"
+msgstr "_Refrescar:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+msgid "_Source URL:"
+msgstr "URL de _origen:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:676 mail/em-composer-prefs.c:904
 msgid "Enabled"
 msgstr "Activado"
 
@@ -4193,19 +4223,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:595 mail/em-composer-prefs.c:653
+#: mail/em-composer-prefs.c:683
 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:595 mail/em-composer-prefs.c:653
+#: mail/em-composer-prefs.c:683
 msgid "Enable"
 msgstr "Activar"
 
@@ -4230,162 +4260,169 @@ msgid "60 minutes"
 msgstr "60 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Avisos"
+msgid "<b>Alerts</b>"
+msgstr "<b>Alertas</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "<b>Task List</b>"
+msgstr "<b>Lista de tareas</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<b>Time</b>"
+msgstr "<b>Hora</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "<b>Work Week</b>"
+msgstr "<b>Semana laboral</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Configuración de agenda y de tareas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Color para las tareas vencidas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Color for tasks due today"
 msgstr "Color para las tareas que vencen hoy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "La jornada _acaba a las:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "días"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Display"
+msgstr "Mostrar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Activar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: 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:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
 #: calendar/gui/e-itip-control.c:563
 msgid "Friday"
 msgstr "Viernes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Lunes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Sábado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "M_ostrar un recordatorio"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Ta_reas que vencen hoy:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Jue"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Lista de tareas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Jueves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Hora"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Formato de la hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Martes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "La _semana empieza en:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Semana laboral"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Días laborables:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "_Añadir URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ación al borrar elementos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "La jornada laboral _comienza a las:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Mostrar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
 #: mail/mail-config.glade.h:160 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
@@ -4395,135 +4432,46 @@ msgstr "_Mostrar"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "_Publicación de disponibilidad"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Vie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_General"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas terminadas tras"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "Tareas fuera de pla_zo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Sáb"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Divisiones de _hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "M_ié"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr "Debe especificar una ubicación de la que obtener la agenda."
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, 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:189
-#, 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:234
-#, 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:247
-#, 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 la "
-"agenda"
-
-#: 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 Tasks Group"
-msgstr "Añadir grupo de tareas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Propiedades de la agenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Remoto"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Propiedades de lista de tareas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Add Calendar"
-msgstr "_Añadir Calendario"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_Add Group"
-msgstr "_Añadir grupo"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "Intervalo de _refresco:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-msgid "_Refresh:"
-msgstr "_Refrescar:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "URL de _origen:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-msgid "_Type:"
-msgstr "_Tipo:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "semanas"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4604,81 +4552,81 @@ 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:463
-#, 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-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Vence "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Vence "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "No se pudo actualizar el objeto"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1037
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Imposible obtener versión actual."
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, 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-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Vence "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Vence "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "No se pudo abrir el origen"
@@ -4765,8 +4713,7 @@ msgstr "La tarea no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:74
 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:77
 msgid "The item could not be deleted because permission was denied"
@@ -4832,7 +4779,7 @@ msgstr "Evento sin fecha de inicio"
 msgid "Event with no end date"
 msgstr "Evento sin fecha de finalización"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
@@ -4916,11 +4863,16 @@ 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:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
+#: calendar/gui/e-cal-model-tasks.c:618 composer/e-msg-composer.c:2110
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:805
+#: mail/mail-account-gui.c:1551 mail/mail-account-gui.c:2045
 #: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
@@ -4940,15 +4892,15 @@ msgstr "Se requiere un organizador."
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un asistente."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: mail/em-folder-tree.c:2609 mail/em-folder-view.c:796
 #: 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
@@ -5061,18 +5013,15 @@ msgstr "Nombre de la lista de tareas"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 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:54
 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:58
-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:72
 msgid "This Instance Only"
@@ -5221,24 +5170,17 @@ msgstr "_Descartar cambios"
 msgid "Save Event"
 msgstr "Guardar acontecimiento"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 msgid "Select source"
 msgstr "Seleccionar origen"
 
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
-msgstr "Seleccione destino %s"
-
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "agenda"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+msgid "_Destination"
+msgstr "_Destino"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "lista de tareas"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Lista de tareas"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5252,8 +5194,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
-msgstr ""
-"La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
+msgstr "La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
 
 #: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
@@ -5269,38 +5210,44 @@ msgid "% _Complete"
 msgstr "% _Terminado"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-cal-component-preview.c:230
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
+#: calendar/gui/e-cal-model-tasks.c:624 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Terminado"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:928
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-cal-component-preview.c:227
+#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
+#: calendar/gui/e-cal-model-tasks.c:622 calendar/gui/e-cal-model-tasks.c:697
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "En proceso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:926
 msgid "Low"
 msgstr "Baja"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: calendar/gui/e-cal-component-preview.c:251
+#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:875
+#: mail/message-list.c:927
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:237
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
+#: calendar/gui/e-cal-model-tasks.c:620 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Sin comenzar"
 
@@ -5335,11 +5282,11 @@ msgstr "Página _web:"
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en «%s»."
@@ -5348,8 +5295,9 @@ msgstr "No es posible abrir las tareas en «%s»."
 msgid "Con_fidential"
 msgstr "Con_fidencial"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:982 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:"
@@ -5493,101 +5441,52 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Público"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privado"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Fecha final"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Fecha de inicio"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Resumen"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: 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-component-preview.c:71 mail/em-folder-view.c:2215
+#, c-format
+msgid "Click to open %s"
+msgstr "Pulse para abrir %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:750
+msgid "Untitled"
+msgstr "Sin título"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Fecha de inicio:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "O"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Fecha de vencimiento:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-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"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Estado:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Prioridad:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "No"
+#: calendar/gui/e-cal-component-preview.c:300
+msgid "Web Page:"
+msgstr "Página web:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 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:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Desconocido"
+#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+msgid "Public"
+msgstr "Público"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Repetición"
+#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330
+msgid "Private"
+msgstr "Privado"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Asignado"
+#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332
+msgid "Confidential"
+msgstr "Confidencial"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5633,17 +5532,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Ocupada"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-view.c:1292 calendar/gui/e-calendar-view.c:1372
+#: mail/em-folder-view.c:771 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -5652,15 +5560,15 @@ msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1378
+#: mail/em-folder-view.c:773 mail/em-popup.c:690 mail/em-popup.c:806
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1271 calendar/gui/e-calendar-view.c:1294
+#: calendar/gui/e-calendar-view.c:1376 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:124
 #: ui/evolution-tasks.xml.h:25
@@ -5668,23 +5576,23 @@ msgid "_Print..."
 msgstr "Im_primir..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: calendar/gui/e-calendar-view.c:1299 calendar/gui/e-calendar-view.c:1342
 #: 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:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1340
+#: mail/em-folder-tree.c:2602 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:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1301
+#: calendar/gui/e-calendar-view.c:1374 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:122 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5741,81 +5649,167 @@ msgstr "Prioridad"
 msgid "Start date"
 msgstr "Fecha de inicio"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
+msgid "Summary"
+msgstr "Resumen"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1352
 msgid "New _Appointment..."
 msgstr "Cit_a nueva..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1357
 msgid "New All Day _Event"
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1362
 msgid "New Meeting"
 msgstr "Reunión nueva"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1367
 msgid "New Task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1281 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Seleccionar _hoy"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1282
 msgid "_Select Date..."
 msgstr "_Seleccionar fecha..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1286 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la información de disponibilidad"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1305
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendario..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendario..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1307
 msgid "_Schedule Meeting..."
 msgstr "Concertar una _reunión..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _repetición"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1348
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1350
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1380 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Configuración..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Fecha final"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-meeting-list-view.c:144
+#: calendar/gui/e-meeting-list-view.c:158 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:1674 camel/camel-gpg-context.c:1725
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1534
+#: camel/providers/imap4/camel-imap4-engine.c:1561
+#: camel/providers/imap4/camel-imap4-engine.c:1591
+#: camel/providers/imap4/camel-imap4-engine.c:1631
+#: camel/providers/imap4/camel-imap4-store.c:1034
+#: camel/providers/imap4/camel-imap4-utils.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1046
+#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: calendar/gui/e-cal-model.c:877
+msgid "Recurring"
+msgstr "Repetición"
+
+#: calendar/gui/e-cal-model.c:879
+msgid "Assigned"
+msgstr "Asignado"
+
+#: calendar/gui/e-cal-model.c:881 calendar/gui/e-cal-model-tasks.c:980
+#: calendar/gui/e-meeting-list-view.c:168 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.c:881 calendar/gui/e-cal-model-tasks.c:980
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "No"
+
+#: 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:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:572
+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
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
+#. strptime format of a weekday, a date and a time,
+#. 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
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5832,36 +5826,43 @@ 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:818 calendar/gui/e-week-view.c:593
+#: 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:821 calendar/gui/e-week-view.c:596
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1572
+#. strftime format %A = full weekday name, %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-day-view.c:1572 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-day-view.c:1605 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d de %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: 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:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisiones por minuto"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -5970,10 +5971,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ninguna</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Estado:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6226,8 +6223,7 @@ msgstr "Actualización terminada\n"
 
 #: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
 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:1814 calendar/gui/e-itip-control.c:1852
 msgid "Object is invalid and cannot be updated\n"
@@ -6388,28 +6384,6 @@ msgstr "Delegado"
 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:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
@@ -6470,7 +6444,42 @@ msgstr "Hora de _inicio de la reunión:"
 msgid "Meeting _end time:"
 msgstr "Hora de _fin de la reunión:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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:2060
+#: calendar/gui/e-meeting-time-sel-item.c:452
+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:2093
+#: calendar/gui/e-meeting-time-sel-item.c:456 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-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Introduzca su contraseña para %s"
+
+#: calendar/gui/e-tasks.c:582 calendar/gui/gnome-cal.c:2021
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6479,24 +6488,19 @@ msgstr ""
 "Error en %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:610 calendar/gui/gnome-cal.c:2060
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
-msgstr ""
-"El backend de tareas para\n"
-"%s\n"
-" se ha colgado."
+msgid "The task backend for '%s' has crashed."
+msgstr "El backend de tareas para %s se ha colgado."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:684
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:707
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6505,51 +6509,95 @@ msgstr ""
 "Error al abrir %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:728
 msgid "Loading tasks"
 msgstr "Cargando tareas"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:832
 msgid "Completing tasks..."
 msgstr "Terminando tareas..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:855
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:882
 msgid "Expunging"
 msgstr "Compactando"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:958
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
+#: calendar/gui/tasks-component.c:637 calendar/gui/tasks-control.c:516
+#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tareas"
+
+#: calendar/gui/gnome-cal.c:1879
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1898
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tareas de %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1921
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2051
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr "El backend de la agenda para %s se ha colgado."
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "El backend de tareas para %s se ha colgado."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2897
 msgid "Purging"
 msgstr "Compactando"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Agenda 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, Agenda y Lista de Tareas aquí"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Agenda y Tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Control de configuración de la agenda 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 de la agenda de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Visor de la agenda de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de agenda/tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Visor de tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Componente de Agenda de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Componente de Tareas de Evolution"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -6924,26 +6972,39 @@ msgstr "Imprimir elemento"
 msgid "Print Setup"
 msgstr "Configurar impresión"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, 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:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Lista de tareas nueva"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d tarea"
+msgstr[1] "%d tareas"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:532
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ",%d seleccionado"
+msgstr[1] ",%d seleccionados"
+
+#: calendar/gui/tasks-component.c:515
 #, 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:476
+#: calendar/gui/tasks-component.c:527
 msgid "There is no calendar available for creating tasks"
 msgstr "No hay una agenda disponible para crear tareas"
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:565
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -6951,27 +7012,27 @@ msgstr ""
 "La lista de tareas seleccionada es de sólo lectura, los eventos no pueden "
 "crearse. Seleccione una agenda con lectura-escritura."
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:793
 msgid "New task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:794
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:795
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:801
 msgid "New tasks group"
 msgstr "Nuevo grupo de tareas"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:802
 msgid "_Tasks Group"
 msgstr "Grupo de _tareas"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:803
 msgid "Create a new tasks group"
 msgstr "Crea una grupo de tareas nuevo"
 
@@ -8642,8 +8703,7 @@ 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"
+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"
@@ -8742,33 +8802,6 @@ msgstr "Argumentos inválidos a (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, 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:358
-#, 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:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(coincidir con todas) requiere un único resultado booleano"
-
-#: camel/camel-folder-search.c:650
-#, 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"
@@ -8800,6 +8833,33 @@ msgstr "Aprendizaje de mensaje(s) de spam/no spam"
 msgid "Filtering new message(s)"
 msgstr "Filtrando mensajes(s) nuevo(s)"
 
+#: camel/camel-folder-search.c:348
+#, 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:358
+#, 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:569 camel/camel-folder-search.c:598
+msgid "(match-all) requires a single bool result"
+msgstr "(coincidir con todas) requiere un único resultado booleano"
+
+#: camel/camel-folder-search.c:650
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Realizando búsqueda en cabecera desconocida: %s"
+
 #: camel/camel-gpg-context.c:712
 #, c-format
 msgid ""
@@ -8830,7 +8890,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
 #: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
@@ -8890,8 +8950,7 @@ msgstr "Esta parte del mensaje está firmada digitalmente"
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr ""
-"No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
+msgstr "No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
 
 #: camel/camel-gpg-context.c:1400
 #, c-format
@@ -8917,6 +8976,26 @@ msgstr "Contenido cifrado"
 msgid "Unable to parse message content"
 msgstr "No se pudo interpretar el contenido del mensaje"
 
+#: 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-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8937,27 +9016,6 @@ msgstr "No se pudo bloquear «%s»: error del protocolo con lock-helper"
 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"
@@ -9127,8 +9185,7 @@ 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"
+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"
@@ -9136,8 +9193,7 @@ 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"
+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"
@@ -9198,8 +9254,7 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
 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."
+msgstr "El manipulador de contexto suministrado no se refiere a un contexto válido."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
@@ -9366,77 +9421,70 @@ msgid "Enter security pass-phrase for `%s'"
 msgstr "Introduzca su frase de paso para %s"
 
 #: camel/camel-smime-context.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot find certificate for '%s'"
-msgstr "Error al buscar el certificado para «%s»."
+msgstr "No se puede encontrar el certificado para «%s»."
 
 #: camel/camel-smime-context.c:267
-#, fuzzy
 msgid "Cannot create CMS message"
-msgstr "No se pudo abrir el mensaje"
+msgstr "No se pudo crear el mensaje CMS"
 
 #: camel/camel-smime-context.c:272
 msgid "Cannot create CMS signedData"
-msgstr ""
+msgstr "No se puede crear el CMS signedData"
 
 #: camel/camel-smime-context.c:278
-#, fuzzy
 msgid "Cannot attach CMS signedData"
-msgstr "No se pudo adjuntar el archivo %s: %s"
+msgstr "No se pudo adjuntar el CMS signedData"
 
 #: camel/camel-smime-context.c:285
-#, fuzzy
 msgid "Cannot attach CMS data"
-msgstr "No se pudo adjuntar el archivo %s: %s"
+msgstr "No se pudo adjuntar los datos CMS"
 
 #: camel/camel-smime-context.c:291
 msgid "Cannot create CMS SignerInfo"
-msgstr ""
+msgstr "No se puede crear la información CMS SignerInfo"
 
 #: camel/camel-smime-context.c:297
 msgid "Cannot find cert chain"
-msgstr ""
+msgstr "No se puede encontrar la cadena del certificado"
 
 #: camel/camel-smime-context.c:303
 msgid "Cannot add CMS SigningTime"
 msgstr ""
 
 #: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
-#, fuzzy, c-format
+#, c-format
 msgid "Encryption cert for '%s' does not exist"
-msgstr "No existe el certificado de cifrado «%s»."
+msgstr "No existe el certificado de cifrado para «%s»"
 
 #: camel/camel-smime-context.c:344
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr ""
+msgstr "No se puede añadir el atributo SMIMEEncKeyPrefs"
 
 #: camel/camel-smime-context.c:349
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
 #: camel/camel-smime-context.c:354
-#, fuzzy
 msgid "Cannot add add encryption certificate"
-msgstr "Certificado de _cifrado:"
+msgstr "No se puede añadir el certificado de cifrado"
 
 #: camel/camel-smime-context.c:360
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
 #: camel/camel-smime-context.c:430
-#, fuzzy
 msgid "Cannot create encoder context"
-msgstr "No se pudo crear un contexto de decodificación S/MIME."
+msgstr "No se pudo crear un contexto de codificación"
 
 #: camel/camel-smime-context.c:436
-#, fuzzy
 msgid "Failed to add data to CMS encoder"
-msgstr "Falló al anexar a la carpeta local «Correo enviado»: %s"
+msgstr "Falló al añadir datos al codificador CMS"
 
 #: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
-#, fuzzy
 msgid "Failed to encode data"
-msgstr "Falló al autenticarme.\n"
+msgstr "Falló al codificar datos"
 
 #: camel/camel-smime-context.c:514
 msgid "Unverified"
@@ -9467,7 +9515,6 @@ msgid "Signature algorithm unknown"
 msgstr "Algoritmo de firma desconocido"
 
 #: camel/camel-smime-context.c:528
-#, fuzzy
 msgid "Signature algorithm unsupported"
 msgstr "Algoritmo de firma no soportado"
 
@@ -9480,28 +9527,24 @@ msgid "Processing error"
 msgstr "Error de procesamiento"
 
 #: camel/camel-smime-context.c:569
-#, fuzzy
 msgid "No signedData in signature"
-msgstr "Añadir script de firma"
+msgstr "No hay datos firmados en la firma"
 
 #: camel/camel-smime-context.c:576
 msgid "Digests missing from enveloped data"
-msgstr ""
+msgstr "Faltan los digests de los datos envueltos"
 
 #: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
-#, fuzzy
 msgid "Cannot calculate digests"
-msgstr "No se pudo crear la carpeta: %s: %s"
+msgstr "No se pudieron calcular los digests"
 
 #: camel/camel-smime-context.c:604
-#, fuzzy
 msgid "Cannot set message digests"
-msgstr "No se pudo obtener mensaje %s: %s"
+msgstr "No se pueden obtener los digests del mensaje"
 
 #: camel/camel-smime-context.c:614
-#, fuzzy
 msgid "Certificate import failed"
-msgstr "Falló en la firma del certificado"
+msgstr "Falló en la importación del certificado"
 
 #: camel/camel-smime-context.c:624
 msgid "Certficate only message, cannot verify certificates"
@@ -9512,9 +9555,8 @@ msgid "Certficate only message, certificates imported and verified"
 msgstr ""
 
 #: camel/camel-smime-context.c:631
-#, fuzzy
 msgid "Can't find signature digests"
-msgstr "Firma válida"
+msgstr "No se pueden encontrar los digests de la firma"
 
 #: camel/camel-smime-context.c:647
 #, c-format
@@ -9522,29 +9564,26 @@ msgid "Signer: %s <%s>: %s\n"
 msgstr "Firmante: %s <%s>: %s\n"
 
 #: camel/camel-smime-context.c:748
-#, fuzzy
 msgid "Decoder failed"
-msgstr "El comando DATA ha fallado"
+msgstr "La decodificación ha fallado"
 
 #: camel/camel-smime-context.c:800
-#, fuzzy, c-format
+#, c-format
 msgid "Can't find certificate for `%s'"
-msgstr "Error al buscar el certificado para «%s»."
+msgstr "No se pudo encontrar un certificado para «%s»"
 
 #: camel/camel-smime-context.c:807
-#, fuzzy
 msgid "Can't find common bulk encryption algorithm"
-msgstr "Error al buscar un algoritmo de volumen común."
+msgstr "No se puede encontrar un algoritmo de encriptación común."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:816
 msgid "Can't allocate slot for encryption bulk key"
-msgstr ""
+msgstr "No se puede reservar un slot para la clave de encriptación"
 
 #: camel/camel-smime-context.c:827
-#, fuzzy
 msgid "Can't create CMS Message"
-msgstr "Crear re_gla desde el mensaje"
+msgstr "No se puede crear un mensaje CMS"
 
 #: camel/camel-smime-context.c:833
 msgid "Can't create CMS EnvelopedData"
@@ -9567,32 +9606,29 @@ msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
 #: camel/camel-smime-context.c:873
-#, fuzzy
 msgid "Can't create encoder context"
-msgstr "No se pudo crear un contexto de decodificación S/MIME."
+msgstr "No se pudo crear un contexto codificación"
 
 #: camel/camel-smime-context.c:884
-#, fuzzy
 msgid "Failed to add data to encoder"
-msgstr "Falló al enviar el nombre de usuario al servidor"
+msgstr "Falló al añadir datos al codificador"
 
 #: camel/camel-smime-context.c:970
 #, c-format
 msgid "Decoder failed, error %d"
-msgstr ""
+msgstr "El decodificador ha fallado, error %d"
 
 #: camel/camel-smime-context.c:977
 msgid "S/MIME Decrypt: No encrypted content found"
-msgstr ""
+msgstr "Desencriptación S/MIME: No se ha encontrado contenido encriptado"
 
 #: camel/camel-smime-context.c:1004
-#, fuzzy
 msgid "import keys: unimplemented"
-msgstr "Comando no implementado"
+msgstr "importación de claves: no implementado"
 
 #: camel/camel-smime-context.c:1012
 msgid "export keys: unimplemented"
-msgstr ""
+msgstr "exportación de claves: no implementado"
 
 #: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
@@ -9635,8 +9671,7 @@ 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"
+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"
@@ -9835,17 +9870,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "No se pudo analizar la URL «%s»"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Error guardando «%s»: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:673
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No existe el mensaje %s en %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:839 camel/camel-vee-folder.c:845
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "No se pudo copiar o mover mensajes a una Carpeta Virtual"
 
@@ -9873,10 +9908,12 @@ 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/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
@@ -9909,6 +9946,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Para acceder a servidores Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
@@ -9929,6 +9967,290 @@ msgstr ""
 msgid "Checklist"
 msgstr "Lista de comprobación"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, 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:415
+#, 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:421
+#, 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:1144
+#: camel/providers/imap4/camel-imap4-engine.c:1533
+#: camel/providers/imap4/camel-imap4-engine.c:1560
+#: camel/providers/imap4/camel-imap4-engine.c:1590
+#: camel/providers/imap4/camel-imap4-engine.c:1630
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "El servidor IMAP4 %s se desconectó inesperadamente: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr "Se obtuvo una respuesta BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, 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:341
+#, 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:476
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "No se pudo compactar la carpeta: «%s»: Desconocido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, 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:616
+#, 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:621
+#, 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:746
+#, 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:775
+#, 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:854
+#, 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:858
+#, 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»: Desconcido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, 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:870
+#, 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:40
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Carpetas"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Mostrar sólo las carpetas suscritas"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Ignorar el espacio de nombres suministrado por el servidor"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Espacio de nombres"
+
+#: 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:165
+#: camel/providers/imap/camel-imap-store.c:424
+#, c-format
+msgid "IMAP server %s"
+msgstr "Servidor IMAP %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:426
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Servicio IMAP para %s en %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:225
+#: camel/providers/imap/camel-imap-store.c:545
+#: camel/providers/imap/camel-imap-store.c:565
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:140
+#: 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/imap4/camel-imap4-store.c:210
+#: camel/providers/imap/camel-imap-store.c:547
+#: 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/imap4/camel-imap4-store.c:222
+#: camel/providers/imap/camel-imap-store.c:562
+#: camel/providers/imap/camel-imap-store.c:799
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Conexión cancelada"
+
+#: camel/providers/imap4/camel-imap4-store.c:261
+#, 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:286
+#: camel/providers/imap/camel-imap-store.c:633
+#: camel/providers/imap/camel-imap-store.c:664
+#, 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/imap4/camel-imap4-store.c:287
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/pop3/camel-pop3-store.c:538
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
+msgid "Unknown error"
+msgstr "Error desconocido"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, 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:418
+#, 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:492
+#, 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:723
+#, 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:782
+#, c-format
+msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "El nombre de la carpeta «%s» es inválido porque contiene el carácter «%c»"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, 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:831
+#, 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:859
+#, 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:891
+#, 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:896
+#, 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:1032
+#, 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:1034
+msgid "Bad command"
+msgstr "Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-store.c:1095
+#, 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:1100
+#, 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:1144
+#, 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:1149
+#, 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:85
+#, 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:108
+msgid "No data"
+msgstr "Sin datos"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "El servidor IMAP %s se desconectó inesperadamente: %s"
+
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
@@ -9942,13 +10264,6 @@ msgstr "Operación cancelada"
 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/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
-msgid "Unknown error"
-msgstr "Error desconocido"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10079,23 +10394,6 @@ msgstr "Usar un comando personalizado para conectarse al servidor"
 msgid "Command:"
 msgstr "Comando:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Carpetas"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Mostrar sólo las carpetas suscritas"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Ignorar el espacio de nombres suministrado por el servidor"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-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 ""
@@ -10118,48 +10416,6 @@ msgstr "IMAP"
 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
-#, c-format
-msgid "IMAP server %s"
-msgstr "Servidor IMAP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Servicio IMAP para %s en %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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:547
-#: 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:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Conexión cancelada"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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:634
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
@@ -10216,10 +10472,8 @@ msgstr "No existe la carpeta %s"
 #: camel/providers/imap/camel-imap-store.c:1807
 #: camel/providers/imap/camel-imap-store.c:2185
 #, 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 elcarácter «%c»"
+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 elcarácter «%c»"
 
 #: camel/providers/imap/camel-imap-store.c:1865
 #: camel/providers/imap/camel-imap-store.c:2246
@@ -10873,10 +11127,8 @@ 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)"
+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"
@@ -10951,8 +11203,7 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-store.c:792
 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."
+msgstr "No puede crear una carpeta en un almacén de noticias: suscríbase en su lugar."
 
 #: camel/providers/nntp/camel-nntp-store.c:800
 msgid "You cannot rename a folder in a News store."
@@ -10980,8 +11231,8 @@ msgid "Could not get group: %s"
 msgstr "No se pudo obtener grupo: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
-msgstr "No se pudieron obtener los mensajes: error no especificado"
+msgid "Could not get messages: unspecified error"
+msgstr "No se pudieron obtener mensajes: error no especificado"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
@@ -11033,8 +11284,8 @@ msgstr "No hay mensajes con uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Obteniendo mensaje POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1223
+#: composer/e-msg-composer.c:1244
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
@@ -11112,8 +11363,7 @@ msgstr "SASL «%s» Falló el inicio de sesión para servidor POP %s: %s"
 #: camel/providers/pop3/camel-pop3-store.c:435
 #, 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"
+msgstr "No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
 
 #: camel/providers/pop3/camel-pop3-store.c:454
 #, c-format
@@ -11149,8 +11399,7 @@ 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."
+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"
@@ -11248,8 +11497,7 @@ 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"
+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"
@@ -11265,8 +11513,7 @@ 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"
+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"
@@ -11330,8 +11577,7 @@ msgstr "El comando STARTTLS ha fallado"
 #: 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."
+msgstr "El servidor SMTP %s no implementa el método de autenticación requerido %s."
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
@@ -11481,7 +11727,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:404
 msgid "attachment"
 msgstr "adjunto"
 
@@ -11525,6 +11771,98 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
+#: composer/e-msg-composer.c:703
+msgid "Cannot sign outgoing message: No signing certificate set for from account"
+msgstr ""
+"No se puede firmar el correo saliente: No hay establecido un certificado de "
+"firma para la cuenta remitente"
+
+#: composer/e-msg-composer.c:709
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for from "
+"account"
+msgstr ""
+"No se puede cifrar el mensaje saliente: no hay establecido un certificado de "
+"cifrado para la cuenta remitente"
+
+#: composer/e-msg-composer.c:1281
+msgid "Could not open file"
+msgstr "No se pudo abrir el archivo"
+
+#: composer/e-msg-composer.c:1289
+msgid "Unable to retrieve message from editor"
+msgstr "No se pudo obtener los mensajes del editor"
+
+#: composer/e-msg-composer.c:1559
+msgid "Untitled Message"
+msgstr "Mensaje sin título"
+
+#: composer/e-msg-composer.c:1589
+msgid "Open file"
+msgstr "Abrir archivo"
+
+#: composer/e-msg-composer.c:1996 mail/mail-account-gui.c:1472
+msgid "Autogenerated"
+msgstr "Auto-generado"
+
+#: composer/e-msg-composer.c:2095
+msgid "Signature:"
+msgstr "Firma:"
+
+#: composer/e-msg-composer.c:2296
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> archivo adjunto"
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2325
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Ocultar barra de _adjuntos (soltar adjuntos aquí)"
+
+#: composer/e-msg-composer.c:2328 composer/e-msg-composer.c:3232
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Mostrar barra de _adjuntos (soltar adjuntos aquí)"
+
+#: composer/e-msg-composer.c:2345 composer/e-msg-composer.c:3111
+#: composer/e-msg-composer.c:3112
+msgid "Compose a message"
+msgstr "Redactar un mensaje"
+
+#: composer/e-msg-composer.c:3145
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"No se pudo crear una ventana de composición:\n"
+"No se pudo activar el control de selección de direcciones."
+
+#: composer/e-msg-composer.c:3173
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"No se pudo crear una ventana de composición:\n"
+"No se pudo activar el componente del editor HTML.\n"
+"Asegúrese de que tiene la versión \n"
+"correcta de gtkhtml y libgtkthml instalada.\n"
+
+#: composer/e-msg-composer.c:3277
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"No se pudo crear una ventana de composición:\n"
+"No se pudo activar el componente del editor HTML."
+
+#: composer/e-msg-composer.c:4282
+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>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Publicar destino"
@@ -11605,101 +11943,6 @@ msgstr "Pulse aquí para seleccionar las carpetas en las que publicar"
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"No se puede firmar el correo saliente: No hay establecido un certificado de "
-"firma para la cuenta remitente"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"No se puede cifrar el mensaje saliente: no hay establecido un certificado de "
-"cifrado para la cuenta remitente"
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "No se pudo abrir el archivo"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "No se pudo obtener los mensajes del editor"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "Mensaje sin título"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Abrir archivo"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Auto-generado"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Firma:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> archivo adjunto"
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Ocultar barra de _adjuntos (soltar adjuntos aquí)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Mostrar barra de _adjuntos (soltar adjuntos aquí)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Redactar un mensaje"
-
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"No se pudo crear una ventana de composición:\n"
-"No se pudo activar el control de selección de direcciones."
-
-#: composer/e-msg-composer.c:3165
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"No se pudo crear una ventana de composición:\n"
-"No se pudo activar el componente del editor HTML.\n"
-"Asegúrese de que tiene la versión \n"
-"correcta de gtkhtml y libgtkthml instalada.\n"
-
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"No se pudo crear una ventana de composición:\n"
-"No se pudo activar el componente del editor HTML."
-
-#: composer/e-msg-composer.c:4274
-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>"
-
 #: composer/mail-composer-errors.xml.in.h:1
 msgid "${1}"
 msgstr ""
@@ -11709,105 +11952,95 @@ msgid "All accounts have been removed."
 msgstr ""
 
 #: composer/mail-composer-errors.xml.in.h:3
-#, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "¿Seguro que quiere borrar esta cita sin título?"
+msgstr "¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
 
 #: composer/mail-composer-errors.xml.in.h:4
 msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgstr "Debido a «${0}», quizá necesite seleccionar diferentes opciones de correo."
 
 #: composer/mail-composer-errors.xml.in.h:5
 msgid "Because \"${1}\"."
-msgstr ""
+msgstr "Debido a «${1}»"
 
 #: composer/mail-composer-errors.xml.in.h:6
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
-msgstr ""
+msgstr "Al cerrar esta ventana de redacción, se descartará el mensaje 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.in.h:7
-#, fuzzy
 msgid "Could not create message."
-msgstr "No se pudo crear un pipe: %s"
+msgstr "No se pudo crear un mensaje."
 
 #: composer/mail-composer-errors.xml.in.h:8
-#, fuzzy
 msgid "Could not read signature file \"{0}\"."
-msgstr "No se pudo guardar el archivo de firma:%s"
+msgstr "No se pudo leer el archivo de firma «{0}."
 
 #: composer/mail-composer-errors.xml.in.h:9
-#, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
-msgstr "No se pudo guardar el archivo de firma:%s"
+msgstr "No se pudo autoguardar el archivo «{0}»"
 
 #: composer/mail-composer-errors.xml.in.h:10
 msgid "Directories can not be attached to Messages."
-msgstr ""
+msgstr "Los directorios no pueden ser adjuntados a los mensajes."
 
 #: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
 msgid "Discard Changes"
-msgstr "_Descartar cambios"
+msgstr "Descartar cambios"
 
 #: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
 msgid "Do you want to recover unfinished messages?"
-msgstr "¿Desea guardar los cambios?"
+msgstr "¿Quiere recuperar los mensajes no terminados?"
 
 #: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
 msgid "Don't Recover"
-msgstr "No eliminar"
+msgstr "No recuperar"
 
 #: composer/mail-composer-errors.xml.in.h:14
-#, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
-msgstr "Error guardando atajos."
+msgstr "Error al autoguardar debido a «{1}»."
 
 #: composer/mail-composer-errors.xml.in.h:15
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
+"Evolution terminó inesperadamente mientras estaba redactando un mensaje nuevo. "
+"La recuperación del mensaje le permitirá continuar donde lo dejó."
 
 #: composer/mail-composer-errors.xml.in.h:16
-#, fuzzy
 msgid "Recover"
-msgstr "Eliminar"
+msgstr "Recuperar"
 
 #: composer/mail-composer-errors.xml.in.h:17
-#, fuzzy
 msgid "Save Message"
-msgstr "Guardar mensaje..."
+msgstr "Guardar mensaje"
 
 #: composer/mail-composer-errors.xml.in.h:18
 msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+msgstr "El archivo «${0}» no es un archivo regular y no puede enviarse en un mensaje."
 
 #: composer/mail-composer-errors.xml.in.h:19
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
-msgstr ""
+msgstr "Para adjuntar el contenido de este directorio, o adjunte individualmente cada archivo, o cree un archivo comprimido del directorio y adjúntelo."
 
 #: composer/mail-composer-errors.xml.in.h:20
-#, fuzzy
 msgid "Unfinished messages found"
-msgstr "Mensajes no leídos"
+msgstr "Se encontraron mensajes no terminados"
 
 #: composer/mail-composer-errors.xml.in.h:21
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
 #: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
 msgid "You cannot attach the file `${0}' to this message."
-msgstr "Adjuntar un archivo al mensaje"
+msgstr "No puede adjuntar el archivo «{0}» a este mensaje."
 
 #: composer/mail-composer-errors.xml.in.h:23
 msgid "You need to configure an account before you can compose mail."
@@ -11942,7 +12175,7 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Quiere sobreescribirlo?"
 
-#: e-util/e-dialog-utils.c:251
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.in.h:7
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
@@ -11964,12 +12197,16 @@ msgstr "Sincr. de categorías:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12021,23 +12258,31 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. 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
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. 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
 msgid "%H:%M"
@@ -12119,53 +12364,44 @@ msgid "_Filter Rules"
 msgstr "Reglas para los _filtros"
 
 #: filter/filter-errors.xml.in.h:1
-#, fuzzy
 msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Error en la expresión regular «%s»:\n"
-"%s"
+msgstr "Error en la expresión regular «{0}»."
 
 #: filter/filter-errors.xml.in.h:2
 msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
+msgstr "No se puede compilar la expresión regular «{1}»."
 
 #: filter/filter-errors.xml.in.h:3
-#, fuzzy
 msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "«%s» no existe o no es un archivo normal."
+msgstr "El archivo «{0}» no existe o no es un archivo regular."
 
 #: filter/filter-errors.xml.in.h:4
-#, fuzzy
 msgid "Missing date."
-msgstr "Actualización de reunión"
+msgstr "Falta la fecha."
 
 #: filter/filter-errors.xml.in.h:5
-#, fuzzy
 msgid "Missing file name."
-msgstr "_Nombre distintivo:"
+msgstr "Falta el nombre de archivo."
 
 #: filter/filter-errors.xml.in.h:6
-#, fuzzy
 msgid "Missing folder."
-msgstr "Moviendo carpeta %s"
+msgstr "Falta la carpeta."
 
 #: filter/filter-errors.xml.in.h:7
-#, fuzzy
 msgid "Missing name."
-msgstr "Asignación"
+msgstr "Falta el nombre."
 
 #: filter/filter-errors.xml.in.h:8
 msgid "Name \"{0}\" already used."
-msgstr ""
+msgstr "El nombre «{0}» ya se está usando."
 
 #: filter/filter-errors.xml.in.h:9
-#, fuzzy
 msgid "No sources selected."
-msgstr "No se ha seleccionado ningún servidor"
+msgstr "No se ha seleccionado ningún origen."
 
 #: filter/filter-errors.xml.in.h:10
 msgid "Please choose another name."
-msgstr ""
+msgstr "Elija otro nombre."
 
 #: filter/filter-errors.xml.in.h:11
 msgid "You must choose a date."
@@ -12176,7 +12412,6 @@ msgid "You must name this filter."
 msgstr "Debes dar un nombre a este filtro."
 
 #: filter/filter-errors.xml.in.h:13
-#, fuzzy
 msgid "You must name this vFolder."
 msgstr "Debe dar un nombre a esta carpeta virtual."
 
@@ -12205,63 +12440,10 @@ msgid "<b>Then</b>"
 msgstr "<b>Entonces</b>"
 
 #: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: mail/mail-account-gui.c:1338
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Importante"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Tareas pendientes"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: 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:746
-msgid "Rule name:"
-msgstr "Nombre de la regla:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Sin título"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>Si</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Ejecutar acciones"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "si se cumplen todos los criterios"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "si se cumple algún criterio"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "entrante"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "saliente"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12350,6 +12532,55 @@ msgstr "con todas las carpetas locales"
 msgid "years"
 msgstr "años"
 
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
+#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+msgid "Important"
+msgstr "Importante"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:79
+#: mail/mail-config.glade.h:145
+msgid "To Do"
+msgstr "Tareas pendientes"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:80
+#: 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:746
+msgid "Rule name:"
+msgstr "Nombre de la regla:"
+
+#: filter/filter-rule.c:773
+msgid "<b>If</b>"
+msgstr "<b>Si</b>"
+
+#: filter/filter-rule.c:804
+msgid "Execute actions"
+msgstr "Ejecutar acciones"
+
+#: filter/filter-rule.c:808
+msgid "if all criteria are met"
+msgstr "si se cumplen todos los criterios"
+
+#: filter/filter-rule.c:813
+msgid "if any criteria are met"
+msgstr "si se cumple algún criterio"
+
+#: filter/filter-rule.c:904
+msgid "incoming"
+msgstr "entrante"
+
+#: filter/filter-rule.c:904
+msgid "outgoing"
+msgstr "saliente"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12479,7 +12710,7 @@ msgstr "no está marcado"
 msgid "Junk Test"
 msgstr "Test de correo Spam"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:804
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiquetar"
@@ -12516,7 +12747,7 @@ msgstr "Encauzar al programa"
 msgid "Play Sound"
 msgstr "Reproducir un sonido"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Leído"
 
@@ -12585,9 +12816,9 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: filter/libfilter-i18n.h:64 mail/em-format.c:747 mail/em-format-html.c:1542
+#: mail/em-format-quote.c:301 mail/em-mailer-prefs.c:89
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Asunto"
@@ -12652,102 +12883,61 @@ msgstr "Carpetas _virtuales"
 msgid "VFolder source"
 msgstr "Origen de la carpeta virtual"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferencias del editor"
-
-#: 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/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"
-
-#: 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 folder viewer"
-msgstr "Componente del visor de carpetas de correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Control de preferencias de Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Correo"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Cuentas de correo"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Opciones de correo"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Predeterminada]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Nombre de la cuenta"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1049
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:908
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:954
 msgid "Add signature script"
 msgstr "Añadir firma"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:974
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:883
+msgid "-------- Forwarded Message --------"
+msgstr "--------- Mensaje reenviado --------"
+
+#: mail/em-composer-utils.c:1494
+msgid "an unknown sender"
+msgstr "un remitente desconocido"
+
+#. translators: attribution string used when quoting messages,
+#. it must contain a single single %%+05d followed by a single '%%s'
+#: mail/em-composer-utils.c:1504
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "El %a, %d-%m-%Y a las %H:%M, %%+05d, %%s escribió:"
+
+#: mail/em-folder-browser.c:143
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear una carpeta _virtual de la búsqueda..."
 
+#: mail/em-folder-browser.c:835 mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:540
+#: mail/mail-component.c:583
+msgid "Mail"
+msgstr "Correo"
+
 #: mail/em-folder-properties.c:120
 msgid "Folder properties"
 msgstr "Propiedades de la carpeta"
@@ -12778,264 +12968,411 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2334
+#: mail/mail-component.c:732
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "Carpetas virtuales"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "NO COINCIDENTE"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Bandeja de entrada"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Cargando..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:934
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo carpeta %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:936
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando carpeta %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:943
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:945
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:961
 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:2108 mail/em-folder-tree.c:2121
+#: mail/em-folder-view.c:673 mail/em-folder-view.c:687
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2148
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta «%s»"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2334 mail/mail-component.c:732
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar la carpeta «%s» a:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Renombrar carpeta"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2597 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:35
 msgid "_View"
 msgstr "_Ver"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2598
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
-#: mail/em-folder-tree.c:2535
+#: mail/em-folder-tree.c:2603
 msgid "_Move"
 msgstr "_Mover"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2607
 msgid "_New Folder..."
 msgstr "Carpeta _nueva..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2610
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2613 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:851
+msgid "VFolders"
+msgstr "Carpetas virtuales"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr "NO COINCIDENTE"
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Bandeja de entrada"
+
+#: mail/em-folder-tree-model.c:468 mail/em-folder-tree-model.c:777
+msgid "Loading..."
+msgstr "Cargando..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:772 mail/em-popup.c:689
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:774
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:777 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:778 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:779 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
+#: mail/em-folder-view.c:780 mail/em-popup.c:813
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:783
 msgid "Follo_w Up..."
 msgstr "Se_guimiento..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:784
 msgid "Fla_g Completed"
 msgstr "Ma_rcar como terminado"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:785
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: mail/em-folder-view.c:787 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:788 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:789
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:790
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:791
 msgid "_Mark as Unimportant"
 msgstr "Marcar como no im_portante"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Marcar como _Spam"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:793 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _no spam"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:797
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:800
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver a la carpeta..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:801 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:809
 msgid "Add Sender to Address_book"
 msgstr "Añadir remitente a la li_breta de direcciones"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:812
 msgid "Appl_y Filters"
 msgstr "Aplicar _filtros"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:813
 msgid "F_ilter Junk"
 msgstr "F_iltrar spam"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:816
 msgid "Crea_te Rule From Message"
 msgstr "Crear re_gla desde el mensaje"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:817
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual según el a_sunto"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:818
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual según el re_mitente"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:819
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual según los des_tinatarios"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:820
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual según la li_sta de correo"
 
-#: mail/em-folder-view.c:821
+#: mail/em-folder-view.c:822
 msgid "VFolder on Thread"
 msgstr "Carpeta virtual según la conversación"
 
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:826
 msgid "Filter on Sub_ject"
 msgstr "Filtro según el _asunto"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:827
 msgid "Filter on Sen_der"
 msgstr "Filtro según el _remitente"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:828
 msgid "Filter on Re_cipients"
 msgstr "Filtro según los _destinatarios"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:829
 msgid "Filter on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
-#: mail/em-folder-view.c:830
+#: mail/em-folder-view.c:831
 msgid "Filter on Thread"
 msgstr "Filtro según la conversación"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1614 mail/em-folder-view.c:1652
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Predeterminado"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1688
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:1951
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2210
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: mail/em-folder-view.c:2214
+#: mail/em-format.c:742 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "De"
+
+#: mail/em-format.c:743 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:85
+msgid "Reply-To"
+msgstr "Responder a"
+
+#: mail/em-format.c:744 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:86 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Para"
+
+#: mail/em-format.c:745 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:87
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format.c:746 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:88
+msgid "Bcc"
+msgstr "Cco"
+
+#: mail/em-format.c:748 mail/em-format-html.c:1586 mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:90 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Fecha"
+
+#: mail/em-format.c:749 mail/em-format-html.c:1607 mail/em-mailer-prefs.c:91
+msgid "Newsgroups"
+msgstr "Grupos de noticias"
+
+#: mail/em-format.c:986
 #, c-format
-msgid "Click to open %s"
-msgstr "Pulse para abrir %s"
+msgid "%s attachment"
+msgstr "%s adjunto"
+
+#: mail/em-format.c:1065 mail/em-format.c:1184
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "No se pudo interpretar el mensaje S/MIME: Error desconocido"
+
+#: mail/em-format.c:1174
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipo de cifrado no soportado para multipart/encrypted"
+
+#: mail/em-format.c:1320
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
+
+#: mail/em-format.c:1339
+msgid "Unsupported signature format"
+msgstr "Formato de firma no soportado"
+
+#: mail/em-format.c:1347
+msgid "Error verifying signature"
+msgstr "Error al verificar la firma"
+
+#: mail/em-format.c:1347
+msgid "Unknown error verifying signature"
+msgstr "Error desconocido al verificar la firma"
+
+#: mail/em-format-html.c:462 mail/em-format-html.c:464
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Obteniendo «%s»"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:646
+msgid "Unsigned"
+msgstr "No firmado"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:647
+msgid "Valid signature"
+msgstr "Firma válida"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:648
+msgid "Invalid signature"
+msgstr "Firma no válida"
+
+#: mail/em-format-html.c:572 mail/em-format-html-display.c:649
+msgid "Valid signature, cannot verify sender"
+msgstr "Firma válida, no se puede verificar el remitente"
+
+#: mail/em-format-html.c:578 mail/em-format-html-display.c:655
+msgid "Unencrypted"
+msgstr "Descifrado"
+
+#: mail/em-format-html.c:579 mail/em-format-html-display.c:656
+msgid "Encrypted, weak"
+msgstr "Cifrado, débil"
+
+#: mail/em-format-html.c:580 mail/em-format-html-display.c:657
+msgid "Encrypted"
+msgstr "Cifrado"
+
+#: mail/em-format-html.c:581 mail/em-format-html-display.c:658
+msgid "Encrypted, strong"
+msgstr "Cifrado, fuerte"
+
+#: mail/em-format-html.c:843
+msgid "Malformed external-body part."
+msgstr "Parte externa al cuerpo del mensaje mal escrita."
+
+#: mail/em-format-html.c:873
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Puntero a sitio FTP (%s)"
+
+#: mail/em-format-html.c:884
+#, 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:886
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Puntero a archivo local (%s)"
+
+#: mail/em-format-html.c:907
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Puntero a sitio FTP (%s)"
+
+#: mail/em-format-html.c:918
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
+
+#: mail/em-format-html.c:1160
+msgid "Formatting message"
+msgstr "Formateando el mensaje"
+
+#. pseudo-header
+#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:935
+msgid "Mailer"
+msgstr "Transporte"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1573
+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:1576
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13043,10 +13380,6 @@ msgstr "Pulse para abrir %s"
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "No firmado"
-
 #: mail/em-format-html-display.c:646
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13055,10 +13388,6 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Firma válida"
-
 #: mail/em-format-html-display.c:647
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13067,10 +13396,6 @@ 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:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Firma no válida"
-
 #: mail/em-format-html-display.c:648
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
@@ -13079,10 +13404,6 @@ msgstr ""
 "La firma de este mensaje no puede ser verificada, pudo haber sido alterada "
 "en tránsito."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
-msgstr "Firma válida, no se puede verificar el remitente"
-
 #: mail/em-format-html-display.c:649
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13091,10 +13412,6 @@ 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:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Descifrado"
-
 #: mail/em-format-html-display.c:655
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13103,10 +13420,6 @@ 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:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Cifrado, débil"
-
 #: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
@@ -13117,10 +13430,6 @@ 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:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Cifrado"
-
 #: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
@@ -13129,10 +13438,6 @@ 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:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Cifrado, fuerte"
-
 #: mail/em-format-html-display.c:658
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
@@ -13176,141 +13481,23 @@ msgstr "_Ocultar"
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Obteniendo «%s»"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Parte externa al cuerpo del mensaje mal escrita."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Puntero a sitio FTP (%s)"
-
-#: mail/em-format-html.c:884
-#, 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:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Puntero a archivo local (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Puntero a sitio FTP (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Formateando el mensaje"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "De"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Responder a"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Para"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Cco"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Transporte"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-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:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Fecha"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Grupos de noticias"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s adjunto"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "No se pudo interpretar el mensaje S/MIME: Error desconocido"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tipo de cifrado no soportado para multipart/encrypted"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Formato de firma no soportado"
-
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "Error al verificar la firma"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Error desconocido al verificar la firma"
-
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrado)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:102
 msgid "Every time"
 msgstr "Cada vez"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:103
 msgid "Once per day"
 msgstr "Una vez por día"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:104
 msgid "Once per week"
 msgstr "Una vez por semana"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:105
 msgid "Once per month"
 msgstr "Una vez por mes"
 
@@ -13355,27 +13542,27 @@ msgstr "Guardar como..."
 msgid "untitled_image.%s"
 msgstr "imagen_sin_título.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Establecer como _fondo"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Responder al remitente"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "E_nviar un mensaje a..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "_Añadir a la libreta de direcciones"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
@@ -13401,42 +13588,28 @@ msgstr "Seleccione un servidor."
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:98
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:288
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "--------- Mensaje reenviado --------"
-
-#: mail/em-utils.c:1137
-msgid "an unknown sender"
-msgstr "un remitente desconocido"
-
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "El %a, %d-%m-%Y a las %H:%M, %%+05d, %%s escribió:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:402
 msgid "message"
 msgstr "mensaje"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:505
 msgid "Save Message..."
 msgstr "Guardar mensaje..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:554
 msgid "Add address"
 msgstr "Añadir dirección"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:989
 #, c-format
 msgid "Messages from %s"
 msgstr "Correos de %s"
@@ -13454,11 +13627,11 @@ msgid "Check incoming mail being junk"
 msgstr "Comprobar si el correo entrante es spam"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr "Color de resaltado de citas"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr "Color de resaltado de citas."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13563,7 +13736,7 @@ msgid "Last time empty trash was run"
 msgstr "Última vez que se vació la papelera"
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
 #: mail/evolution-mail.schemas.in.in.h:30
@@ -13586,7 +13759,7 @@ msgstr "Lista de cabeceras personalizadas y si están activadas."
 #: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Lista de etiquetas conocidas para el componente de correo de Evolution. La "
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
@@ -13679,8 +13852,7 @@ 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:54
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+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:55
@@ -13765,15 +13937,14 @@ msgstr "Reproducir un archivo de sonido cuando llegue correo nuevo."
 
 #: mail/evolution-mail.schemas.in.in.h:74
 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
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en línea"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada del diálogo de suscripción"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13916,33 +14087,59 @@ msgstr "puerto para iniciar el spamd ejecutado por el usuario"
 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 folder viewer"
+msgstr "Componente del visor de carpetas de correo de Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Control de preferencias de Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Cuentas de correo"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Opciones de correo"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13950,14 +14147,14 @@ msgstr "Evolution está importando su correo antiguo de Elm"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-outlook-importer.c:226
 #: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importando..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:227
+#: mail/importers/evolution-outlook-importer.c:228
 #: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Por favor espere"
@@ -13987,18 +14184,46 @@ msgid "Select folder to import into"
 msgstr "Seleccione la carpeta en la que importar"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando «%s»"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importando buzón de correo"
 
-#: mail/importers/mail-importer.c:354
+#: 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:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizando %s"
@@ -14113,120 +14338,123 @@ msgstr "Pine"
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Usuario:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar a %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Asunto es %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:318
+#: mail/mail-autofilter.c:317
 #, c-format
 msgid "Replies to %s"
 msgstr "Responde a %s"
 
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:493
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:495
 #, c-format
 msgid "%d junk"
 msgstr "%d spam"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:518
 #, c-format
 msgid "%d drafts"
 msgstr "%d borradores"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:520
 #, c-format
 msgid "%d sent"
 msgstr "%d enviar"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:522
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:526
 #, c-format
 msgid "%d total"
 msgstr "%d en total"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:528
 #, c-format
 msgid ", %d unread"
 msgstr ", %d no leídos"
 
-#: mail/mail-component.c:531
-#, c-format
-msgid ", %d selected"
-msgstr ",%d seleccionados"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:684
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:685
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:686
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:692
 msgid "New Mail Folder"
 msgstr "Nueva carpeta de correo"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:693
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:694
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: mail/mail-component.c:871
+#: mail/mail-component.c:872
 msgid "URI of the mail source that the view will display"
 msgstr "URI de la fuente de correo que la vista mostrará"
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:899
+msgid "Checking Service"
+msgstr "Comprobando el servicio"
+
+#: mail/mail-config.c:977 mail/mail-config.c:981
+msgid "Connecting to server..."
+msgstr "Conectando al servidor..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14236,12 +14464,12 @@ msgstr ""
 "«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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Recepción de correo"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14250,15 +14478,15 @@ msgstr ""
 "Si no está seguro, pregúntele a su administrador de sistemas o a su "
 "Proveedor de Servicios de Internet."
 
-#: mail/mail-config-druid.c:381
+#: 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:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Envío de correo"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14267,11 +14495,11 @@ msgstr ""
 "no está seguro, pregúntele a su administrador de sistemas o a su Proveedor "
 "de Servicios de Internet."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14285,14 +14513,6 @@ msgstr ""
 "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:888
-msgid "Checking Service"
-msgstr "Comprobando el servicio"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Conectando al servidor..."
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "_Comprobar tipos soportados "
@@ -14547,8 +14767,7 @@ msgstr "No citar el mensaje original"
 
 #: mail/mail-config.glade.h:71
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr ""
-"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
+msgstr "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
 #: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
@@ -14583,7 +14802,7 @@ msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr "A_nchura fija:"
 
 #: mail/mail-config.glade.h:82
@@ -14893,10 +15112,8 @@ msgid "description"
 msgstr "descripción"
 
 #: mail/mail-errors.xml.in.h:1
-#, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
+msgstr "Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
 
 #: mail/mail-errors.xml.in.h:2
 msgid ""
@@ -14909,40 +15126,34 @@ msgid "Are you sure you want to delete this account?"
 msgstr "¿Seguro que quiere borrar esta cuenta?"
 
 #: mail/mail-errors.xml.in.h:4
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
-msgstr "¿Seguro que quiere abrir %d mensajes en ventanas separadas?"
+msgstr "¿Seguro que quiere eliminar permanentemente todos los mensajes borrados en la carpeta «{0}»?"
 
 #: mail/mail-errors.xml.in.h:5
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr ""
-"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr "¿Seguro que quiere eliminar todos los mensajes borrados en todas las carpetas?"
 
 #: mail/mail-errors.xml.in.h:6
-#, fuzzy
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr "¿Seguro que quiere reenviar todos los %d mensajes?"
+msgstr "¿Seguro que quiere enviar un mensaje en formato HTML?"
 
 #: mail/mail-errors.xml.in.h:7
-#, fuzzy
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "¿Seguro que quiere reenviar todos los %d mensajes?"
+msgstr "¿Seguro que quiere enviar un mensaje con sólo destinatarios Cco?"
 
 #: mail/mail-errors.xml.in.h:8
-#, fuzzy
 msgid "Are you sure you want to send a message without a subject?"
-msgstr "¿Seguro que quiere reenviar todos los %d mensajes?"
+msgstr "¿Seguro que quiere enviar un mensaje sin un asunto?"
 
 #: mail/mail-errors.xml.in.h:9
 msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:10
+#: mail/mail-errors.xml.in.h:10 widgets/misc/e-system-errors.xml.in.h:2
 msgid "Because \"{1}\"."
 msgstr ""
 
@@ -14955,123 +15166,98 @@ msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
 #: mail/mail-errors.xml.in.h:13
-#, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "No se pudo copiar la carpeta: %s"
+msgstr "No se pudo copiar la carpeta: «{0}» a «{1}»."
 
 #: mail/mail-errors.xml.in.h:14
-#, fuzzy
 msgid "Cannot create folder \"{0}\"."
-msgstr "No se pudo crear la carpeta: %s: %s"
+msgstr "No se pudo crear la carpeta: «{0}»."
 
 #: mail/mail-errors.xml.in.h:15
-#, fuzzy
 msgid "Cannot create temporary save directory."
-msgstr "No se pudo crear el directorio temporal: %s"
+msgstr "No se pudo crear el directorio de guardado temporal."
 
 #: mail/mail-errors.xml.in.h:16
-#, fuzzy
 msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"No se pudo crear el directorio\n"
-"%s\n"
-"Error: %s"
+msgstr "No se pudo crear el directorio de guardado, debido a «{1}»"
 
 #: mail/mail-errors.xml.in.h:17
-#, fuzzy
 msgid "Cannot delete folder \"{0}\"."
-msgstr ""
-"No se pudo borrar la carpeta:\n"
-"%s"
+msgstr "No se puede borrar la carpeta «{0}»."
 
 #: mail/mail-errors.xml.in.h:18
-#, fuzzy
 msgid "Cannot delete system folder \"{0}\"."
-msgstr "No se pudo borrar la carpeta local %s."
+msgstr "No se pudo borrar la carpeta de sistema «{0}»."
 
 #: mail/mail-errors.xml.in.h:19
-#, fuzzy
 msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "No se puede obtener la carpeta «%s»: la carpeta no existe."
+msgstr "No se puede editar la carpeta virtual «{0}» porque no existe."
 
 #: mail/mail-errors.xml.in.h:20
-#, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "No se pudo mover la carpeta: %s"
+msgstr "No se puede mover la carpeta «{0}» a «{1}»."
 
 #: mail/mail-errors.xml.in.h:21
-#, fuzzy
 msgid "Cannot open source \"{1}\""
-msgstr "No se pudo abrir el origen"
+msgstr "No se pudo abrir el origen «{1}»"
 
 #: mail/mail-errors.xml.in.h:22
-#, fuzzy
 msgid "Cannot open source \"{2}\"."
-msgstr "No se pudo abrir el origen"
+msgstr "No se pudo abrir el origen «{2}»"
 
 #: mail/mail-errors.xml.in.h:23
-#, fuzzy
 msgid "Cannot open target \"{2}\"."
-msgstr "No se pudo abrir el mensaje"
+msgstr "No se pudo abrir el destino «{2}»."
 
 #: mail/mail-errors.xml.in.h:24
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "No se puede renombrar «{0}» a «{1}»."
 
 #: mail/mail-errors.xml.in.h:25
-#, fuzzy
 msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "No se pudo renombrar la carpeta local %s."
+msgstr "No se pudo renombrar o mover la carpeta de sistema «{0}»."
 
 #: mail/mail-errors.xml.in.h:26
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "No se puede guardar los cambios en la cuenta."
 
 #: mail/mail-errors.xml.in.h:27
-#, fuzzy
 msgid "Cannot save to directory \"{0}\"."
-msgstr "No se pudo crear el directorio «%s»: %s."
+msgstr "No se pudo guardar al directorio «{0}»."
 
 #: mail/mail-errors.xml.in.h:28
-#, fuzzy
 msgid "Cannot save to file \"{0}\"."
-msgstr ""
-"No se pudo guardar en «%s»\n"
-"  %s"
+msgstr "No se pudo guardar al archivo «{0}»."
 
 #: mail/mail-errors.xml.in.h:29
-#, fuzzy
 msgid "Cannot set signature script \"{0}\"."
-msgstr "Añadir firma"
+msgstr "No se puede establacer el script de firma «{0}»."
 
 #: mail/mail-errors.xml.in.h:30
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
+"Verifique que su contraseña está escrita corractamente. Recuerde que muchas contraseñas "
+"distinguen las mayúsculas, su tecla de bloqueo de mayúsculas puede estar activada."
 
 #: mail/mail-errors.xml.in.h:31
-#, fuzzy
 msgid "Could not save signature file."
-msgstr "No se pudo guardar el archivo de firma:%s"
+msgstr "No se pudo guardar el archivo de firma."
 
 #: mail/mail-errors.xml.in.h:32
-#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr "Borrar «%s»"
+msgstr "¿Borrar «{0}»?"
 
 #: mail/mail-errors.xml.in.h:33
-#, fuzzy
 msgid "Delete account?"
-msgstr "Borra los contactos seleccionados"
+msgstr "¿Borrar la cuenta?"
 
 #: mail/mail-errors.xml.in.h:34
-#, fuzzy
 msgid "Discard changed?"
-msgstr "_Descartar los cambios"
+msgstr "¿Descartar los cambios?"
 
 #: mail/mail-errors.xml.in.h:35
-#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "¿Desea guardar los cambios?"
 
@@ -15080,69 +15266,56 @@ msgid "Don't delete"
 msgstr "No borrar"
 
 #: mail/mail-errors.xml.in.h:37
-#, fuzzy
 msgid "Enter password."
-msgstr "Introduzca contraseña"
+msgstr "Introduzca la contraseña."
 
 #: mail/mail-errors.xml.in.h:38
-#, fuzzy
 msgid "Error loading filter definitions."
-msgstr ""
-"Error cargando la información del filtro:\n"
-"%s"
+msgstr "Error al cargar las definiciones de filtros."
 
 #: mail/mail-errors.xml.in.h:39
-#, fuzzy
 msgid "Error while performing operation."
-msgstr ""
-"Error al efectuar operación:\n"
-"%s"
+msgstr "Error al efectuar operación."
 
 #: mail/mail-errors.xml.in.h:40
-#, fuzzy
 msgid "Error while {0}."
-msgstr ""
-"Error mientras «%s»':\n"
-"%s"
+msgstr "Error mientras «{0}»."
 
 #: mail/mail-errors.xml.in.h:41
-#, fuzzy
 msgid "File exists but cannot overwrite it."
-msgstr "El archivo existe, ¿quiere sobreescribirlo?"
+msgstr "El archivo existe pero no se puede sobreescribir."
 
 #: mail/mail-errors.xml.in.h:42
-#, fuzzy
 msgid "File exists but is not a regular file."
-msgstr "«%s» no existe o no es un archivo normal."
+msgstr "El archivo existe pero no es un archivo regular."
 
 #: mail/mail-errors.xml.in.h:43
 msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+msgstr "Si continua, no podrá recuperar estos mensajes."
 
 #: mail/mail-errors.xml.in.h:44
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
-msgstr ""
+msgstr "Si borra la carpeta, todo su contenido y el de sus subcarpetas será borrado permanentemente."
 
 #: mail/mail-errors.xml.in.h:45
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+msgstr "Si continúa, la información de la cuenta se borrará permanentemente."
 
 #: mail/mail-errors.xml.in.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr ""
+msgstr "Si sale, estos mensajes no serán enviados hasta que Evoluion sea iniciado de nuevo."
 
 #: mail/mail-errors.xml.in.h:47
-#, fuzzy
 msgid "Invalid authentication"
-msgstr "Autenticación"
+msgstr "Autenticación inválida"
 
 #: mail/mail-errors.xml.in.h:48
 msgid "Mail filters automatically updated."
-msgstr ""
+msgstr "Filtros de correo actualizados automáticamente."
 
 #: mail/mail-errors.xml.in.h:49
 msgid ""
@@ -15150,35 +15323,31 @@ msgid ""
 "BCC recipients. This header, if added, will list all of your recipients to "
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
-msgstr ""
+msgstr "Muchos sistemas de correo-e añaden una cabecera «Apparentely-To» a los mensajes que sólo tienen destinatarios Cco. Esta cabecera, si se añade, listará todos los destinatarios de su mensaje de todas formas. Para evitar esto debería añadir al menos un destinatario «Para:» o «CC:»."
 
 #: mail/mail-errors.xml.in.h:50
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
-msgstr ""
+msgstr "Por favor, introduzca una dirección de correo válida en el campo «Para:» Puede buscar direcciones de correo pulsando en el botón «Para:» al lado de la caja de entrada."
 
 #: mail/mail-errors.xml.in.h:51
-#, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email: {0} Send anyway?"
 msgstr ""
-"Está enviando un mensaje formateado en HTML. Por favor, asegúrese de\n"
-"que los siguientes destinatarios desean y son capaces de recibir\n"
-"mensajes formateados en HTML:\n"
-"¿%sEnviar de todas formas?"
+"Por favor, asegúrese de que los siguientes destinatarios desean y son capaces de recibir"
+"mensajes formateados en HTML: ¿{0} Enviar de todas formas?"
 
 #: mail/mail-errors.xml.in.h:52
-#, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "¿Seguro que quiere borrar la carpeta «%s» y todas sus subcarpetas?"
+msgstr "¿Seguro que quiere borrar la carpeta «{0}» y todas sus subcarpetas?"
 
 #: mail/mail-errors.xml.in.h:53
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
-msgstr ""
+msgstr "Ximian Evolution requiere las carpetas de sistema para funcionar correctamente y no pueden ser renombradas, movidas o borradas."
 
 #: mail/mail-errors.xml.in.h:54
 msgid ""
@@ -15190,26 +15359,18 @@ msgid ""
 msgstr ""
 
 #: mail/mail-errors.xml.in.h:55
-#, fuzzy
 msgid ""
 "The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
 "have been updated."
 msgstr ""
-"La(s) siguiente(s) carpeta(s) virtual(es):\n"
-"%s Usaban la carpeta borrada:\n"
-"    «%s»\n"
+"La(s) siguiente(s) reglas de filtros: {0} usaban la carpeta eliminada:{1}»"
 "Y han sido actualizadas."
 
 #: mail/mail-errors.xml.in.h:56
-#, fuzzy
 msgid ""
 "The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
 "been updated."
-msgstr ""
-"La(s) siguiente(s) carpeta(s) virtual(es):\n"
-"%s Usaban la carpeta borrada:\n"
-"    «%s»\n"
-"Y han sido actualizadas."
+msgstr "La(s) siguiente(s) carpeta(s) virtual(es): {0} Usaban la carpeta borrada: «{1}» y han sido actualizadas."
 
 #: mail/mail-errors.xml.in.h:57
 msgid ""
@@ -15229,44 +15390,32 @@ msgid ""
 msgstr ""
 
 #: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+msgid "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
 #: mail/mail-errors.xml.in.h:61
-#, fuzzy
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr ""
-"El servidor SMTP %s no implementa el método de autenticación requerido %s."
+msgstr "Este servidor no soporta este  tipo de autenticación requerido y quizá no soporte ningún tipo de autenticación."
 
 #: mail/mail-errors.xml.in.h:62
-#, fuzzy
 msgid "This signature has been changed, but has not been saved."
-msgstr ""
-"Esta firma ha cambiado, pero no ha sido guardada.\n"
-"\n"
-"¿Quiere guardar los cambios?"
+msgstr "Esta firma ha cambiado, pero no ha sido guardada."
 
 #: mail/mail-errors.xml.in.h:63
-#, fuzzy
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr ""
-"No se pudo abrir la carpeta de borradores para esta cuenta.\n"
-"¿Quiere usar la carpeta de borradores predeterminada?"
+msgstr "No se pudo abrir la carpeta de borradores para esta cuenta. ¿Quiere usar la carpeta de borradores del sistema?"
 
 #: mail/mail-errors.xml.in.h:64
-#, fuzzy
 msgid "Use _Default"
-msgstr "Predeterminado"
+msgstr "Usar _predeterminado"
 
 #: mail/mail-errors.xml.in.h:65
-#, fuzzy
 msgid "Use default drafts folder?"
-msgstr "Ruta hacia la carpeta de contactos predeterminada"
+msgstr "¿Quiere usar la carpeta de borradores predeterminada?"
 
 #: mail/mail-errors.xml.in.h:66
 msgid "You have not filled in all of the required information."
@@ -15293,19 +15442,16 @@ msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
 #: mail/mail-errors.xml.in.h:72
-#, fuzzy
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
 #: mail/mail-errors.xml.in.h:73
-#, fuzzy
 msgid "_Expunge"
 msgstr "C_ompactar"
 
 #: mail/mail-errors.xml.in.h:74
-#, fuzzy
 msgid "_Send"
-msgstr "Enviar"
+msgstr "_Enviar"
 
 #: mail/mail-errors.xml.in.h:75
 msgid "vFolders automatically updated."
@@ -15336,20 +15482,20 @@ msgstr "Haciendo ping a %s"
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtrando carpeta"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falló al aplicar los filtros al correo saliente: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15358,115 +15504,115 @@ msgstr ""
 "Falló al anexar a %s: %s\n"
 "Anexando a la carpeta local «Correo enviado» en su lugar."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Fallo al enviar %d de %d mensajes"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta «%s»"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta «%s»"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Compactando carpeta"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15475,7 +15621,7 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15484,11 +15630,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15497,17 +15643,17 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
@@ -15571,24 +15717,24 @@ msgstr "Actualizando..."
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Recuerda esta contraseña"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recordar esta clave durante el resto de esta sesión"
 
@@ -15604,113 +15750,113 @@ msgstr "Introduzca un nombre para esta firma."
 msgid "Name:"
 msgstr "Nombre:"
 
-#: mail/mail-tools.c:114
+#: mail/mail-tools.c:116
 #, 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:143
 #, 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:278
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaje reenviado - %s"
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:280
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:319
+#: mail/mail-tools.c:321
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Carpeta inválida: «%s»"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Configurando carpeta virtual: %s"
 
-#: mail/mail-vfolder.c:207
+#: mail/mail-vfolder.c:206
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualizando carpetas virtuales para la URI: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:921
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:960
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1044
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:916
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:917
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:918
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:919
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:920
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:924
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:925
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:929
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:930
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1249
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1256
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1265
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1277
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1285
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1287
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3114
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -15742,43 +15888,43 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Llamar"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "No reenviar"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Seguir el mensaje"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Para su información"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Revisar"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Marcar para seguimiento"
 
@@ -15822,51 +15968,31 @@ msgstr "_Suscribir"
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
-#: 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/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Grupo de atajos por omisión"
-
-#: 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:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Anchura predeterminada del panel de la barra de atajos"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Altura predeterminada de la ventana"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Anchura predeterminada de la ventana"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Versión de la configuración de Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 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:9
+#: shell/apps_evolution_shell.schemas.in.in.h:7
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
@@ -15874,7 +16000,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:10
+#: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
@@ -15882,61 +16008,19 @@ 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: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 "Path to the default calendar folder"
-msgstr "Ruta a la carpeta de agenda predeterminada"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Ruta hacia la carpeta de contactos predeterminada"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Ruta hacia la carpeta de correo predeterminada"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Ruta hacia la carpeta de tareas predeterminada"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "URI física hacia la carpeta de agenda predeterminada"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "URI Física hacia la carpeta de contactos predeterminada"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "URI física hacia la carpeta de correo predeterminada"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "URI física a la carpeta de tareas predeterminada"
+#: shell/apps_evolution_shell.schemas.in.in.h:9
+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:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 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:21
-msgid "Whether to show the folder bar"
-msgstr "Indica si se muestra la barra de carpetas"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Indica si se muestra la barra de atajos"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr "Indica si debe saltar el diálogo de advertencia de desarrollo"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "correo"
 
@@ -15944,6 +16028,34 @@ msgstr "correo"
 msgid "Brought to you by"
 msgstr "Producido por"
 
+#: shell/e-shell.c:536
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+"Atención: Evolution no pudo actualizar todos sus datos de la versión %d.%d.%"
+"d.\n"
+"Los datos no se han borrado, pero no se verán con esta versión de "
+"Evolution.\n"
+
+#: shell/e-shell.c:1081
+msgid "Invalid arguments"
+msgstr "Argumentos inválidos"
+
+#: shell/e-shell.c:1083
+msgid "Cannot register on OAF"
+msgstr "No se pudo registrar en OAF"
+
+#: shell/e-shell.c:1085
+msgid "Configuration Database not found"
+msgstr "No se encontró la base de datos de configuración"
+
+#: shell/e-shell.c:1087
+msgid "Generic error"
+msgstr "Error genérico"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sin título)"
@@ -16084,7 +16196,7 @@ msgstr "_Importar"
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Preferencias de Evolution"
 
@@ -16112,8 +16224,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 \"/\"."
@@ -16127,86 +16238,55 @@ 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:336
+msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution está conectado.  Pulse este botón para trabajar "
+"desconectado."
+
+#: shell/e-shell-window.c:343
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution está en proceso de desconectarse."
+
+#: shell/e-shell-window.c:349
+msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution está desconectado.  Pulse este botón para trabajar "
+"conectado."
+
 #: shell/e-shell-window-commands.c:63
 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:71
 #, c-format
 msgid "Error executing %s."
 msgstr "Error ejecutando %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:120
 msgid "Bug buddy is not installed."
 msgstr "Bug Buddy no está instalado."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:128
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug Buddy."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:170
 msgid "About Ximian Evolution"
 msgstr "Acerca de Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:381
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution está conectado.  Pulse este botón para trabajar "
-"desconectado."
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution está en proceso de desconectarse."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution está desconectado.  Pulse este botón para trabajar "
-"conectado."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Atención: Evolution no pudo actualizar todos sus datos de la versión %d.%d.%"
-"d.\n"
-"Los datos no se han borrado, pero no se verán con esta versión de "
-"Evolution.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Argumentos inválidos"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "No se pudo registrar en OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "No se encontró la base de datos de configuración"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Error genérico"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Casilla de verificación"
@@ -16276,6 +16356,42 @@ msgstr "Conexiones activas"
 msgid "Click OK to close these connections and go offline"
 msgstr "Pulse Aceptar para cerrar estas conexiones y quedar desconectado"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "_Agenda:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+msgid "_Contacts:"
+msgstr "_Contactos: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "Co_rreo:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Tareas:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "_Tipo de carpeta:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Abrir carpeta de otro usuario"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "Cuent_a:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Nombre de la _carpeta:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Usuario:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuración de Evolution"
@@ -16318,6 +16434,18 @@ msgstr ""
 "\n"
 "Pulse el botón «Aplicar» para guardar su configuración. "
 
+#: 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. "
@@ -16473,12 +16601,12 @@ msgstr ""
 "  use %s --help para más información\n"
 
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr "Seleccionar un certificado para importar..."
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Nombre del certificado"
 
@@ -16695,8 +16823,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:44
-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:"
@@ -16709,11 +16836,6 @@ msgstr "Tiene archivados los certificados que identifican a estas personas:"
 msgid "Your Certificates"
 msgstr "Sus certificados"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "El certificado ya existe"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16904,6 +17026,11 @@ msgstr "ID único del propósito"
 msgid "Certificate Signature Value"
 msgstr "Valor de la firma del certificado"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "El certificado ya existe"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Contraseña para el archivo PKCS12"
@@ -16943,12 +17070,12 @@ msgstr "Asunto predeterminado para el mensaje."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "No se pudo ejecutar: «%s»: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Cerrando %s (%s)\n"
@@ -17012,7 +17139,7 @@ msgid "Select all contacts"
 msgstr "Seleccionar todos los contactos"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+msgid "Send a message to the selected contacts."
 msgstr "Envía un mensaje a los contactos seleccionados."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17043,8 +17170,8 @@ msgstr "Ver el contacto actual"
 #: 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-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "A_cciones"
@@ -17186,10 +17313,20 @@ msgstr "Ver la cita actual"
 msgid "Week"
 msgstr "Semana"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Semana laboral"
+
 #: ui/evolution-calendar.xml.h:42
 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
@@ -17380,8 +17517,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"
@@ -17440,10 +17576,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"
@@ -17511,6 +17645,16 @@ msgstr "_Invertir selección"
 msgid "_Threaded Message List"
 msgstr "_Lista de mensajes por conversaciones"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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:26
+msgid "_Close"
+msgstr "_Cerrar"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "_Añadir remitente a la libreta de direcciones"
@@ -17923,16 +18067,6 @@ msgstr "_Herramientas"
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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:26
-msgid "_Close"
-msgstr "_Cerrar"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Adjuntar"
@@ -18544,6 +18678,30 @@ msgstr "Otro..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:76 widgets/misc/e-error.c:77
+#: widgets/misc/e-error.c:119
+msgid "Evolution Error"
+msgstr "Error de Evolution"
+
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:117
+msgid "Evolution Warning"
+msgstr "Advertencia de Evolution"
+
+#: widgets/misc/e-error.c:116
+msgid "Evolution Information"
+msgstr "Información de Evolution"
+
+#: widgets/misc/e-error.c:118
+msgid "Evolution Query"
+msgstr "Consulta de Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:430
+#, c-format
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Error interno, solicitado un error desconocido «%s»</span>"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Expandido"
@@ -18657,6 +18815,30 @@ msgstr "Texto"
 msgid "Find _Now"
 msgstr "Buscar _ahora"
 
+#: widgets/misc/e-system-errors.xml.in.h:1
+msgid "Because \"{1}\""
+msgstr ""
+
+#: widgets/misc/e-system-errors.xml.in.h:3
+msgid "Cannot open file \"{0}\"."
+msgstr "No se pudo abrir el archivo «{0}»."
+
+#: widgets/misc/e-system-errors.xml.in.h:4
+msgid "Cannot save file \"{0}\"."
+msgstr "No se pudo guardar el archivo {0}."
+
+#: widgets/misc/e-system-errors.xml.in.h:5
+msgid "Do you wish to overwrite it?"
+msgstr "¿Quiere sobreescribirlo?"
+
+#: widgets/misc/e-system-errors.xml.in.h:6
+msgid "File exists \"{0}\"."
+msgstr "El archivo existe «{0}»."
+
+#: widgets/misc/e-system-errors.xml.in.h:8
+msgid "_Overwrite"
+msgstr "_Sobreescribir"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18667,6 +18849,69 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
+#~ msgid "Alerts"
+#~ msgstr "Avisos"
+
+#~ msgid "Time"
+#~ msgstr "Hora"
+
+#~ msgid "_General"
+#~ msgstr "_General"
+
+#~ msgid "Select destination %s"
+#~ msgstr "Seleccione destino %s"
+
+#~ msgid "calendar"
+#~ msgstr "agenda"
+
+#~ msgid "task list"
+#~ msgstr "lista de tareas"
+
+#~ msgid ""
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "El backend de tareas para\n"
+#~ "%s\n"
+#~ " se ha colgado."
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Grupo de atajos por omisión"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Anchura predeterminada del panel de la barra de atajos"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Ruta a la carpeta de agenda predeterminada"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Ruta hacia la carpeta de contactos predeterminada"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Ruta hacia la carpeta de correo predeterminada"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Ruta hacia la carpeta de tareas predeterminada"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "URI física hacia la carpeta de agenda predeterminada"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "URI Física hacia la carpeta de contactos predeterminada"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "URI física hacia la carpeta de correo predeterminada"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "URI física a la carpeta de tareas predeterminada"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Indica si se muestra la barra de carpetas"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Indica si se muestra la barra de atajos"
+
 #~ msgid "Address Book Creation Assistant"
 #~ msgstr "Asistente de creación de libretas de direcciones"
 
@@ -18689,9 +18934,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Group:"
 #~ msgstr "Grupo:"
 
-#~ msgid "New Address Book"
-#~ msgstr "Libreta de direcciones nueva"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -18956,16 +19198,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Móvil:"
 
-#~ 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 "UID of the contacts source that the view will display"
-#~ msgstr "UID de la fuente de contactos que la vista mostrará"
-
-#~ msgid "The URI that the address book will display"
-#~ msgstr "La URI que mostrará la libreta de direcciones"
-
 #~ msgid " B_usiness:"
 #~ msgstr " _Trabajo:"
 
@@ -19132,15 +19364,6 @@ msgstr "%s (%d%% completado)"
 #~ "remota. Esto requiere que \n"
 #~ "especifique parámetros adicionales."
 
-#~ msgid "Start Date:"
-#~ msgstr "Fecha de inicio:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Fecha de vencimiento:"
-
-#~ msgid "Priority:"
-#~ msgstr "Prioridad:"
-
 #~ msgid "Internal error: expecting CamelMultipart, got \"%s\""
 #~ msgstr "Error interno: se esperaba CamelMultipart, se obtuvo «%s»"
 
@@ -19150,9 +19373,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "_Selection:"
 #~ msgstr "_Selección:"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Introduzca su contraseña para %s"
-
 #, fuzzy
 #~ msgid "New Addressbook Book"
 #~ msgstr "Libreta de direcciones nueva"
@@ -19223,30 +19443,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "No se pudo encontrar la carpeta compartida especificada."
 
-#~ msgid "C_alendar:"
-#~ msgstr "_Agenda:"
-
-#~ msgid "_Mail:"
-#~ msgstr "Co_rreo:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Tareas:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "_Tipo de carpeta:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Abrir carpeta de otro usuario"
-
-#~ msgid "_Account:"
-#~ msgstr "Cuent_a:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "Nombre de la _carpeta:"
-
-#~ msgid "_User:"
-#~ msgstr "_Usuario:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Crear una ventana nueva"
 
@@ -19268,74 +19464,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "_Go To Today"
 #~ msgstr "_Ir a hoy"
 
-#~ msgid "Unexpected response from IMAP server %s: %s"
-#~ msgstr "Respuesta inesperada del servidor IMAP %s: %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 "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "El servidor IMAP %s se desconectó inesperadamente: %s"
-
-#~ msgid "Got BYE response"
-#~ msgstr "Se obtuvo una respuesta BYE"
-
-#~ 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 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 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 "<b>Filter Rules</b>"
 #~ msgstr "<b>Reglas para los filtros</b>"
 
@@ -19856,9 +19984,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Could not copy messages to temporary mbox folder: %s"
 #~ msgstr "No se pudo copiar los mensajes a la carpeta buzón temporal: %s"
 
-#~ msgid "Evolution Error"
-#~ msgstr "Error de Evolution"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -19989,15 +20114,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "<b>Basics</b>"
 #~ msgstr "<b>Básico</b>"
 
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "<b>Recordatorios</b>"
-
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Alertas</b>"
-
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Lista de tareas</b>"
-
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Clasificación</b>"
 
@@ -20682,9 +20798,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "No cards"
 #~ msgstr "Sin tarjetas"
 
-#~ msgid "%d cards"
-#~ msgstr "%d tarjetas"
-
 #~ msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #~ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,ñ,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -21022,9 +21135,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Configure the appearance of the Evolution Summary here"
 #~ msgstr "Configure la apariencia del Resumen de Evolution aquí"
 
-#~ msgid "Evolution Summary"
-#~ msgstr "Resumen de Evolution"
-
 #~ msgid "Evolution Summary component"
 #~ msgstr "Componente del resumen de Evolution"
 
@@ -29857,3 +29967,4 @@ msgstr "%s (%d%% completado)"
 
 #~ msgid "th"
 #~ msgstr "º"
+
author	Francisco Javier F. Serrador <serrador@cvs.gnome.org>	2004-05-04 18:25:31 +0800
committer	Francisco Javier Fernandez Serrador <serrador@src.gnome.org>	2004-05-04 18:25:31 +0800
commit	8028fcb3d7d92b82e613c366e111465967b2811a (patch)
tree	b3994db736ddcfa4610a5ee6ec8e8ac29ddef503 /po
parent	ddc0dc65f57f8a01f2744becf35a08eb4ef8e848 (diff)
download	gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar.gz gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar.bz2 gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar.lz gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar.xz gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.tar.zst gsoc2013-evolution-8028fcb3d7d92b82e613c366e111465967b2811a.zip