Updated Spanish translation.

2004-03-28  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>

	* es.po: Updated Spanish translation.

svn path=/trunk/; revision=25212

1 files changed, 1359 insertions, 1089 deletions

diff --git a/po/es.po b/po/es.po
index 933cbe7544..8fdf450f1b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-22 17:17+0100\n"
-"PO-Revision-Date: 2004-03-22 17:42+0100\n"
+"POT-Creation-Date: 2004-03-28 19:56+0200\n"
+"PO-Revision-Date: 2004-03-28 20:46+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"
@@ -26,6 +26,40 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+msgid "evolution addressbook"
+msgstr "libreta de direcciones de Evolution"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+msgid "current addressbook folder "
+msgstr "carpeta de libretas de direcciones actual"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "have "
+msgstr "tiene"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr "tiene "
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " cards"
+msgstr "tarjetas"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+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:"
@@ -104,14 +138,14 @@ msgstr "Gestione sus certificados S/Mime aquí"
 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-component.c:308
+#: addressbook/gui/component/addressbook-component.c:313
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
-#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/component/addressbook-component.c:314
 #: addressbook/gui/widgets/e-addressbook-view.c:1077
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -119,32 +153,32 @@ msgstr "Libreta de direcciones nueva"
 msgid "Delete"
 msgstr "Borrar"
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:435 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "Create a new contact"
 msgstr "Crea un contacto nuevo"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:566
 msgid "New Contact List"
 msgstr "Lista de contactos nueva"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:567
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
@@ -202,18 +236,20 @@ 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:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:509
 #: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
 #: mail/mail-component.c:236
 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:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:517
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Privado"
 
@@ -273,7 +309,7 @@ msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
-"No se pudo abrir esta libreta de direcciones. Compruebeque la ruta exista y "
+"No se pudo abrir esta libreta de direcciones. Compruebe que la ruta exista y "
 "que tenga permisos para acceder a ella."
 
 #: addressbook/gui/component/addressbook.c:601
@@ -281,7 +317,7 @@ msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
-"No se pudo abrir esta libreta de direcciones.  Esto significaque ha "
+"No se pudo abrir esta libreta de direcciones.  Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
 #: addressbook/gui/component/addressbook.c:606
@@ -292,14 +328,14 @@ msgid ""
 msgstr ""
 "Esta versión de Evolution no se le ha compilado el soporte LDAP.Si quiere "
 "usar LDAP en Evolution debe compilar el programa de las fuentes del CVS una "
-"vez que haya obtenido OpenLDAP delsiguiente enlace."
+"vez que haya obtenido OpenLDAP del siguiente enlace."
 
 #: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
-"No se pudo abrir esta libreta de direcciones.  Esto significaque ha "
+"No se pudo abrir esta libreta de direcciones.  Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
 #: addressbook/gui/component/addressbook.c:632
@@ -351,7 +387,6 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
 msgid "\n"
 msgstr "\n"
 
@@ -374,7 +409,7 @@ msgstr " Mo_strar bases soportadas "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: 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
@@ -418,7 +453,7 @@ msgid "Address Book Sources"
 msgstr "Fuentes de la libreta de direcciones"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Siempre"
 
@@ -466,7 +501,7 @@ msgstr "Terminar"
 
 #: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
@@ -477,7 +512,7 @@ msgid "Group:"
 msgstr "Grupo:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nunca"
 
@@ -729,7 +764,7 @@ msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
@@ -757,7 +792,7 @@ msgstr "Límite de _descarga:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -830,7 +865,7 @@ msgid "Send HTML Mail?"
 msgstr "¿Enviar correo en HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/widgets/eab-popup-control.c:1001
 msgid "Add to Contacts"
 msgstr "Añadir a contactos"
 
@@ -913,7 +948,7 @@ msgstr "Colaboración"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2065
+#: addressbook/gui/contact-editor/e-contact-editor.c:1997
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -922,7 +957,7 @@ msgid "D_epartment:"
 msgstr "D_epartamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalles"
@@ -1007,13 +1042,13 @@ msgstr "_Categorías..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-calendar-view.c:1332
-#: calendar/gui/e-calendar-view.c:1363 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2504
-#: mail/em-folder-view.c:765 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 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:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1057 calendar/gui/e-calendar-table.c:1075
+#: calendar/gui/e-calendar-view.c:1335 calendar/gui/e-calendar-view.c:1366
+#: mail/em-folder-tree.c:2504 mail/em-folder-view.c:765
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:35
+#: 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:19
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -1066,9 +1101,9 @@ msgstr "Dirección"
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: 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:250
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
@@ -2054,7 +2089,7 @@ msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2917
+#: addressbook/gui/contact-editor/e-contact-editor.c:2813
 #: addressbook/gui/widgets/eab-contact-display.c:310
 #: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
@@ -2069,20 +2104,21 @@ msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2920
+#: addressbook/gui/contact-editor/e-contact-editor.c:2816
 #: addressbook/gui/widgets/eab-contact-display.c:309
 #: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:741
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr "Servicio"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "Location"
 msgstr "Ubicación"
 
@@ -2091,111 +2127,95 @@ msgid "Username"
 msgstr "Nombre de usuario"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2585
-#: addressbook/gui/contact-editor/e-contact-editor.c:2881
+#: addressbook/gui/contact-editor/e-contact-editor.c:2481
+#: addressbook/gui/contact-editor/e-contact-editor.c:2777
 msgid "Home"
 msgstr "Domicilio"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2885
+#: addressbook/gui/contact-editor/e-contact-editor.c:2781
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Trabajo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2586
-#: addressbook/gui/contact-editor/e-contact-editor.c:2889
+#: addressbook/gui/contact-editor/e-contact-editor.c:2482
+#: addressbook/gui/contact-editor/e-contact-editor.c:2785
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
 msgstr "Libro fuente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
 msgstr "Libro destino"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Contactos"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
 msgstr "Es un contacto nuevo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
 msgstr "Modificados"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:755
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
 msgstr "Nombre de la cuenta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1463
 msgid "Category editor not available."
 msgstr "No hay un editor de categorías disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/contact-editor/e-contact-editor.c:1471
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertenece a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1695
 msgid "Save Contact as VCard"
 msgstr "Guardar contacto como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1771
-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/e-contact-editor.c:1774
-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.c:2584
+#: addressbook/gui/contact-editor/e-contact-editor.c:2480
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2916
+#: addressbook/gui/contact-editor/e-contact-editor.c:2812
 #: addressbook/gui/widgets/eab-contact-display.c:307
 #: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2918
+#: addressbook/gui/contact-editor/e-contact-editor.c:2814
 #: addressbook/gui/widgets/eab-contact-display.c:312
 #: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2919
+#: addressbook/gui/contact-editor/e-contact-editor.c:2815
 #: addressbook/gui/widgets/eab-contact-display.c:311
 #: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2921
+#: addressbook/gui/contact-editor/e-contact-editor.c:2817
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3208
+#: addressbook/gui/contact-editor/e-contact-editor.c:3104
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No se pudo encontrar el widget para el campo: «%s»"
@@ -2209,6 +2229,7 @@ msgid "_Edit Full"
 msgstr "_Editar todo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
 msgstr "Nombre _completo:"
 
@@ -2216,6 +2237,22 @@ 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:"
@@ -2353,8 +2390,8 @@ msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista infer
 msgid "contact-list-editor"
 msgstr "Editor de lista de contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:209
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
@@ -2362,16 +2399,16 @@ msgstr "Editor de lista de contactos"
 msgid "Book"
 msgstr "Libro"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
 msgstr "Es una lista nueva"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
 msgstr "Guardar lista como VCard"
 
@@ -2423,15 +2460,13 @@ msgid "No contacts"
 msgstr "Sin contactos"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 contacto"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
 #, c-format
-msgid "%d contacts"
-msgstr "%d contactos"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d contacto"
+msgstr[1] "%d contactos"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
 #: addressbook/gui/widgets/e-addressbook-view.c:223
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
@@ -2439,7 +2474,7 @@ msgstr "%d contactos"
 msgid "Query"
 msgstr "Consulta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "Error al obtener la vista de libro"
 
@@ -2476,14 +2511,13 @@ msgstr "Avanzado..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:230
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-list-view.c:340
+#: 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:497
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
@@ -2555,7 +2589,7 @@ msgid "Cut"
 msgstr "Cortar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/calendar-component.c:372 calendar/gui/tasks-component.c:363
+#: calendar/gui/calendar-component.c:432 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"
@@ -2567,7 +2601,7 @@ msgid "Paste"
 msgstr "Pegar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1081
-#: calendar/gui/e-calendar-view.c:1299
+#: calendar/gui/e-calendar-view.c:1302
 msgid "Current View"
 msgstr "Vista actual"
 
@@ -2617,8 +2651,6 @@ msgid "Car Phone"
 msgstr "Teléfono del coche"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categorías"
 
@@ -2722,7 +2754,7 @@ 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:347
+#: calendar/gui/e-meeting-list-view.c:256
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
@@ -2888,39 +2920,40 @@ msgstr "Puesto"
 msgid "Home page"
 msgstr "Página personal"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
 msgstr "Éxito"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap-store.c:263
 #: camel/providers/pop3/camel-pop3-store.c:538
 #: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
 msgstr "Contacto no encontrado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
 msgstr "Ya existe el ID del contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
@@ -2931,61 +2964,61 @@ msgstr "Protocolo no implementado"
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
 msgstr "Falló en la autenticación"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
 msgstr "Autenticación Requerida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
 msgstr "TLS no Disponible"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Address Book does not exist"
 msgstr "La libreta de direcciones no existe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
 msgstr "Otro error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
 msgstr "¿Desea guardar los cambios?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
 msgstr "Error añadiendo lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
 msgstr "Error añadiendo contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
 msgstr "Error modificando lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
 msgstr "Error modificando contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
 msgstr "Error eliminando lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
 msgstr "Error eliminando contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2994,7 +3027,7 @@ msgstr ""
 "Abrir %d contactos abrirá %d ventanas nuevas también.\n"
 "¿Quiere realmente mostrar todas estos contactos?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3003,49 +3036,49 @@ msgstr ""
 "%s ya existe\n"
 "¿Quiere sobreescribirlo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Error guardando %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:310
+#: addressbook/gui/widgets/eab-gui-util.c:311
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Select target addressbook."
 msgstr "Seleccione la libreta de direcciones destino."
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
 msgstr "VCards múltiples"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -3081,33 +3114,31 @@ msgstr "Añadir dirección al contacto existente «%s»"
 msgid "Querying Address Book..."
 msgstr "Consultando la libreta de direcciones..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
 msgstr "Editar información del contacto"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
 msgstr "Combinar direcciones de correo-e"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
-msgid "and %d other contacts."
-msgstr "y otros %d contactos."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
 msgid "and one other contact."
-msgstr "y un contacto más."
+msgid_plural "and %d other contacts."
+msgstr[0] "y otro contacto."
+msgstr[1] "y otros %d contactos."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
 msgid "Show Full VCard"
-msgstr "Mostrar Vcard completa"
+msgstr "Mostrar VCard completa"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Mostrar VCard compacta"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "Guardar en la libreta de direcciones"
 
@@ -3255,7 +3286,7 @@ msgstr "Márgenes"
 msgid "Number of columns:"
 msgstr "Número de columnas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Opciones"
 
@@ -3434,7 +3465,7 @@ msgid "Unnamed List"
 msgstr "Lista de anónimos"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Introduzca contraseña"
 
@@ -3511,7 +3542,7 @@ 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:1138 calendar/gui/print.c:1819
+#: calendar/gui/e-tasks.c:1139 calendar/gui/print.c:1819
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3587,12 +3618,12 @@ msgstr ""
 "Empezando a las %s\n"
 "Terminando a las %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1085
-#: calendar/gui/alarm-notify/alarm-queue.c:1109
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3604,7 +3635,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrará un diálogo de recordatorio normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1115
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3621,7 +3652,7 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1129
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
@@ -3679,7 +3710,7 @@ msgstr "Intervalos mostrados en las vistas de día y semana laboral"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "List of urls for free/busy publishing"
-msgstr "Lista de urls para publicación de disponibilidad"
+msgstr "Lista de URLs para publicación de disponibilidad"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Minute the workday ends on"
@@ -3789,9 +3820,9 @@ msgstr "La ubicación contiene"
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1585
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3847,70 +3878,70 @@ msgstr "%d de %B de %Y"
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/calendar-component.c:313
+#: calendar/gui/calendar-component.c:373
 #, 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:370
+#: calendar/gui/calendar-component.c:430
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Agenda nueva"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:926
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:927
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:928
 msgid "Create a new appointment"
 msgstr "Crear una cita nueva"
 
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:933
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:934
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:935
 msgid "Create a new meeting request"
 msgstr "Crear una solicitud de reunión nueva"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:940
 msgid "New all day appointment"
 msgstr "Cita para todo el día nueva"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:941
 msgid "All _Day Appointment"
 msgstr "Cita para todo el _día"
 
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:942
 msgid "Create a new all-day appointment"
 msgstr "Crear una cita nueva para todo el día"
 
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:947
 msgid "New calendar"
 msgstr "Agenda nueva"
 
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:948
 msgid "C_alendar"
 msgstr "_Agenda"
 
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:949
 msgid "Create a new calendar"
 msgstr "Crear una agenda nueva"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1016
 #, 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:945
+#: calendar/gui/calendar-component.c:1028
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay una agenda disponible para crear eventos y reuniones"
 
@@ -3940,10 +3971,6 @@ msgstr "Vista semanal"
 msgid "Month View"
 msgstr "Vista mensual"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "Vista de lista"
-
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Error al abrir la agenda"
@@ -3961,16 +3988,16 @@ msgstr "Permiso denegado para abrir la agenda"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "No se pudo abrir la carpeta en «%s»"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrará la agenda"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
 msgstr "El tipo de vista a mostrar"
 
@@ -4061,11 +4088,11 @@ msgstr "Básicos"
 msgid "Date/Time:"
 msgstr "Fecha/Hora:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
 msgstr "Mostrar un mensaje"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Reproducir un sonido"
 
@@ -4073,17 +4100,17 @@ msgstr "Reproducir un sonido"
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:467
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Enviar un correo-e"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:164
 msgid "Summary:"
 msgstr "Resumen:"
@@ -4114,7 +4141,7 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4125,7 +4152,7 @@ msgstr "comienzo de cita"
 #. 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:415 mail/em-account-prefs.c:493
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: mail/em-composer-prefs.c:710 mail/em-composer-prefs.c:874
 msgid "Enabled"
 msgstr "Habilitado"
 
@@ -4141,8 +4168,8 @@ msgstr "No eliminar"
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
 #: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
 #: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
+#: mail/em-composer-prefs.c:719
 msgid "Disable"
 msgstr "Desactivar"
 
@@ -4150,8 +4177,8 @@ msgstr "Desactivar"
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
 #: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
 #: mail/em-account-prefs.c:356 mail/em-account-prefs.c:401
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:695
+#: mail/em-composer-prefs.c:719
 msgid "Enable"
 msgstr "Activar"
 
@@ -4175,7 +4202,7 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "Alerts"
 msgstr "Avisos"
 
@@ -4200,7 +4227,7 @@ msgid "Days"
 msgstr "días"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Habilitar"
 
@@ -4340,7 +4367,6 @@ msgid "_Fri"
 msgstr "_Vie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_General"
 
@@ -4658,8 +4684,9 @@ msgstr "Entrada del diario - %s"
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-calendar-view.c:1057
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1190 calendar/gui/e-calendar-view.c:1060
+#: composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Guardar como..."
 
@@ -4675,15 +4702,15 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Imposible obtener versión actual."
 
-#: calendar/gui/dialogs/copy-source-dialog.c:58
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "No se pudo abrir el origen"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:66
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 msgid "Could not open destination"
 msgstr "No se pudo abrir el destino"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:75
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
 msgstr "El destino es de sólo lectura"
 
@@ -4716,18 +4743,24 @@ msgstr "¿Esta seguro que quiere borrar esta entrada del diario sin título?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "¿Seguro que quiere borrar %d citas?"
+msgid "Are you sure you want to delete %d appointment?"
+msgid_plural "Are you sure you want to delete %d appointments?"
+msgstr[0] "¿Seguro que quiere borrar %d cita?"
+msgstr[1] "¿Seguro que quiere borrar %d citas?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:138
 #, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "¿Seguro que quiere borrar %d tareas?"
+msgid "Are you sure you want to delete %d task?"
+msgid_plural "Are you sure you want to delete %d tasks?"
+msgstr[0] "¿Seguro que quiere borrar %d tarea?"
+msgstr[1] "¿Seguro que quiere borrar %d tareas?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
+#: calendar/gui/dialogs/delete-comp.c:145
 #, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "¿Seguro que quiere borrar %d entradas del diario?"
+msgid "Are you sure you want to delete %d journal entry?"
+msgid_plural "Are you sure you want to delete %d journal entries?"
+msgstr[0] "¿Seguro que quiere borrar %d entrada del diario?"
+msgstr[1] "¿Seguro que quiere borrar %d entradas del diario?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
@@ -4861,8 +4894,6 @@ msgstr "Agenda:"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Clasificación"
 
@@ -4920,8 +4951,8 @@ msgstr "Hora de _inicio:"
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
 #: mail/em-account-prefs.c:454 mail/em-folder-view.c:774
-#: mail/mail-account-gui.c:1310 mail/mail-account-gui.c:1838
-#: mail/mail-config.glade.h:80
+#: mail/mail-account-gui.c:1316 mail/mail-account-gui.c:1850
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4945,7 +4976,7 @@ msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:331
+#: calendar/gui/e-meeting-list-view.c:240
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Participantes"
@@ -4981,14 +5012,14 @@ msgid "Member"
 msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:354
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Confirmar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-list-view.c:361
+#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:270
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
@@ -5207,6 +5238,25 @@ msgstr "_Descartar cambios"
 msgid "Save Event"
 msgstr "Guardar acontecimiento"
 
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+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:71
+msgid "task list"
+msgstr "lista de tareas"
+
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "La información de la reunión ha sido creada. ¿Desea enviarla?"
@@ -5262,7 +5312,7 @@ msgid "Low"
 msgstr "Baja"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:864 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
 #: calendar/gui/e-tasks.c:229 mail/message-list.c:938
 msgid "Normal"
 msgstr "Normal"
@@ -5327,9 +5377,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:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Descripción:"
 
@@ -5395,130 +5445,111 @@ msgstr "Semanalmente"
 
 #: calendar/gui/e-alarm-list.c:395
 #, c-format
-msgid "%d days"
-msgstr "%d días"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d día"
+msgstr[1] "%d días"
 
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 día"
-
-#: calendar/gui/e-alarm-list.c:403
+#: calendar/gui/e-alarm-list.c:400
 #, c-format
-msgid "%d weeks"
-msgstr "%d semanas"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 semana"
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d semana"
+msgstr[1] "%d semanas"
 
-#: calendar/gui/e-alarm-list.c:411
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
-msgid "%d hours"
-msgstr "%d horas"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 hora"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
 
-#: calendar/gui/e-alarm-list.c:419
+#: calendar/gui/e-alarm-list.c:410
 #, c-format
-msgid "%d minutes"
-msgstr "%d minutos"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minuto"
-
-#: calendar/gui/e-alarm-list.c:427
+#: calendar/gui/e-alarm-list.c:415
 #, c-format
-msgid "%d seconds"
-msgstr "%d segundos"
-
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 segundo"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
 
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Acción a realizar desconocida"
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes de comenzar la cita"
 
-#: calendar/gui/e-alarm-list.c:492
+#: calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s tras el comienzo de la cita"
 
-#: calendar/gui/e-alarm-list.c:497
+#: calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s al comienzo de la cita"
 
-#: calendar/gui/e-alarm-list.c:506
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes de terminar a cita"
 
-#: calendar/gui/e-alarm-list.c:509
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s tras finalizar la cita"
 
-#: calendar/gui/e-alarm-list.c:514
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s al finalizar la cita"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:312
-#: calendar/gui/e-cal-model.c:319 calendar/gui/e-calendar-table.c:369
+#: 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:369
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:321
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:323
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "Descripción"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Fecha final"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: 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-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr " "
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "componente"
-
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Libre"
@@ -5554,149 +5585,44 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:870
-#: calendar/gui/e-meeting-list-view.c:259 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-cal-model-tasks.c:966 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-model-tasks.c:966 calendar/gui/e-cal-model.c:870
-#: calendar/gui/e-meeting-list-view.c:260 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-cal-model-tasks.c:966 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"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:325 calendar/gui/e-cal-model.c:328
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-meeting-list-view.c:235
-#: calendar/gui/e-meeting-list-view.c:249 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
+#: 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:1665 camel/camel-gpg-context.c:1716
 #: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap-engine.c:1524
+#: camel/providers/imap4/camel-imap-engine.c:1551
+#: camel/providers/imap4/camel-imap-engine.c:1581
+#: camel/providers/imap4/camel-imap-engine.c:1621
+#: camel/providers/imap4/camel-imap-utils.c:290
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2130
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/e-cal-model.c:866
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
 msgstr "Repetición"
 
-#: calendar/gui/e-cal-model.c:868
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/e-calendar-view.c:677 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Borrando los objetos seleccionados"
-
-#: calendar/gui/e-calendar-view.c:778 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Actualizando objetos"
-
-#: calendar/gui/e-calendar-view.c:1284 calendar/gui/e-calendar-view.c:1371
-msgid "New _Appointment..."
-msgstr "Cit_a nueva..."
-
-#: calendar/gui/e-calendar-view.c:1285 calendar/gui/e-calendar-view.c:1373
-msgid "New All Day _Event"
-msgstr "Acont_ecimiento nuevo para todo el día"
-
-#: calendar/gui/e-calendar-view.c:1286 calendar/gui/e-calendar-view.c:1375
-msgid "New Meeting"
-msgstr "Reunión nueva"
-
-#: calendar/gui/e-calendar-view.c:1287 calendar/gui/e-calendar-view.c:1377
-msgid "New Task"
-msgstr "Tarea nueva"
-
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1314
-#: calendar/gui/e-calendar-view.c:1383 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 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:23
-msgid "_Print..."
-msgstr "Im_primir..."
-
-#: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1321
-#: calendar/gui/e-calendar-view.c:1381 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1367
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Ir a _hoy"
-
-#: calendar/gui/e-calendar-view.c:1302 calendar/gui/e-calendar-view.c:1369
-msgid "_Go to Date..."
-msgstr "_Ir a una fecha..."
-
-#: calendar/gui/e-calendar-view.c:1306 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicar la información de disponibilidad"
-
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1379
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Abrir"
-
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1385
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:128
-msgid "_Save As..."
-msgstr "Guardar _como..."
-
-#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1361
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: 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-view.c:1320 calendar/gui/e-calendar-view.c:1359
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2497 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: calendar/gui/e-calendar-view.c:1325
-msgid "Cop_y to Calendar..."
-msgstr "Cop_ia al calendario..."
-
-#: calendar/gui/e-calendar-view.c:1326
-msgid "Mo_ve to Calendar..."
-msgstr "Mo_ver al calendario..."
-
-#: calendar/gui/e-calendar-view.c:1327
-msgid "_Schedule Meeting..."
-msgstr "Concertar una _reunión..."
-
-#: calendar/gui/e-calendar-view.c:1328
-msgid "_Forward as iCalendar..."
-msgstr "Reenviar como i_Calendar..."
-
-#: calendar/gui/e-calendar-view.c:1333 calendar/gui/e-calendar-view.c:1364
-msgid "Delete this _Occurrence"
-msgstr "Borrar esta _repetición"
-
-#: calendar/gui/e-calendar-view.c:1334 calendar/gui/e-calendar-view.c:1365
-msgid "Delete _All Occurrences"
-msgstr "Borrar tod_as las repeticiones"
-
-#: calendar/gui/e-calendar-view.c:1387 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Configuración..."
-
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
@@ -5741,10 +5667,63 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
+#: calendar/gui/e-calendar-table.c:698 calendar/gui/e-calendar-view.c:680
+msgid "Deleting selected objects"
+msgstr "Borrando los objetos seleccionados"
+
+#: calendar/gui/e-calendar-table.c:861 calendar/gui/e-calendar-view.c:781
+msgid "Updating objects"
+msgstr "Actualizando objetos"
+
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1382
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Abrir"
+
 #: calendar/gui/e-calendar-table.c:1038
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
+#: calendar/gui/e-calendar-view.c:1316 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Save As..."
+msgstr "Guardar _como..."
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1082
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1317
+#: calendar/gui/e-calendar-view.c:1386 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:39 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:23
+msgid "_Print..."
+msgstr "Im_primir..."
+
+#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
+#: calendar/gui/e-calendar-view.c:1322 calendar/gui/e-calendar-view.c:1364
+#: 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:1045 calendar/gui/e-calendar-table.c:1071
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1362
+#: mail/em-folder-tree.c:2497 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:18
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1080
+#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1324
+#: calendar/gui/e-calendar-view.c:1384 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:22
+msgid "_Paste"
+msgstr "_Pegar"
+
 #: calendar/gui/e-calendar-table.c:1050
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
@@ -5766,7 +5745,7 @@ msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
 #: calendar/gui/e-calendar-table.c:1368
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Click to add a task"
 msgstr "Pulse aquí para añadir una tarea"
 
@@ -5775,42 +5754,87 @@ msgstr "Pulse aquí para añadir una tarea"
 msgid "% Complete"
 msgstr "% Terminado"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Alarmas"
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
 #: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Completion date"
 msgstr "Fecha de terminación"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Due date"
 msgstr "Fecha de vencimiento"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical position"
-msgstr "Posición geográfica"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Prioridad"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Start date"
 msgstr "Fecha de inicio"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/e-calendar-view.c:1287 calendar/gui/e-calendar-view.c:1374
+msgid "New _Appointment..."
+msgstr "Cit_a nueva..."
+
+#: calendar/gui/e-calendar-view.c:1288 calendar/gui/e-calendar-view.c:1376
+msgid "New All Day _Event"
+msgstr "Acont_ecimiento nuevo para todo el día"
+
+#: calendar/gui/e-calendar-view.c:1289 calendar/gui/e-calendar-view.c:1378
+msgid "New Meeting"
+msgstr "Reunión nueva"
+
+#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1380
+msgid "New Task"
+msgstr "Tarea nueva"
+
+#: calendar/gui/e-calendar-view.c:1304 calendar/gui/e-calendar-view.c:1370
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Ir a _hoy"
+
+#: calendar/gui/e-calendar-view.c:1305 calendar/gui/e-calendar-view.c:1372
+msgid "_Go to Date..."
+msgstr "_Ir a una fecha..."
+
+#: calendar/gui/e-calendar-view.c:1309 ui/evolution-calendar.xml.h:40
+msgid "_Publish Free/Busy Information"
+msgstr "_Publicar la información de disponibilidad"
+
+#: calendar/gui/e-calendar-view.c:1328
+msgid "Cop_y to Calendar..."
+msgstr "Cop_ia al calendario..."
+
+#: calendar/gui/e-calendar-view.c:1329
+msgid "Mo_ve to Calendar..."
+msgstr "Mo_ver al calendario..."
+
+#: calendar/gui/e-calendar-view.c:1330
+msgid "_Schedule Meeting..."
+msgstr "Concertar una _reunión..."
+
+#: calendar/gui/e-calendar-view.c:1331
+msgid "_Forward as iCalendar..."
+msgstr "Reenviar como i_Calendar..."
+
+#: calendar/gui/e-calendar-view.c:1336 calendar/gui/e-calendar-view.c:1367
+msgid "Delete this _Occurrence"
+msgstr "Borrar esta _repetición"
+
+#: calendar/gui/e-calendar-view.c:1337 calendar/gui/e-calendar-view.c:1368
+msgid "Delete _All Occurrences"
+msgstr "Borrar tod_as las repeticiones"
+
+#: calendar/gui/e-calendar-view.c:1390 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Configuración..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #. strptime format of a weekday, a date and a time,
@@ -5885,106 +5909,98 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetición compuesta)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, c-format
 msgid "Every day"
-msgstr "Cada día"
+msgid_plural "Every %d days"
+msgstr[0] "Cada día"
+msgstr[1] "Cada %d días"
 
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:607
 #, c-format
-msgid "Every %d days"
-msgstr "Cada %d días"
-
-#: calendar/gui/e-itip-control.c:611
 msgid "Every week"
-msgstr "Cada semana"
+msgid_plural "Every %d weeks"
+msgstr[0] "Cada semana"
+msgstr[1] "Cada %d semanas"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:609
 #, c-format
-msgid "Every %d weeks"
-msgstr "Cada %d semanas"
-
-#: calendar/gui/e-itip-control.c:616
 msgid "Every week on "
-msgstr "Cada semana en"
+msgid_plural "Every %d weeks on "
+msgstr[0] "Cada semana en"
+msgstr[1] "Cada %d semanas en"
 
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Cada %d semanas en"
-
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
 msgstr " y "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
 msgstr "El %s día de "
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de"
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, c-format
 msgid "every month"
-msgstr "cada mes"
+msgid_plural "every %d months"
+msgstr[0] "cada mes"
+msgstr[1] "cada %d meses"
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:648
 #, c-format
-msgid "every %d months"
-msgstr "Cada %d meses"
-
-#: calendar/gui/e-itip-control.c:662
 msgid "Every year"
-msgstr "Cada año"
+msgid_plural "Every %d years"
+msgstr[0] "Cada año"
+msgstr[1] "Cada %d años"
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:659
 #, c-format
-msgid "Every %d years"
-msgstr "Cada %d años"
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] "un total de %d vez"
+msgstr[1] " un total de %d veces"
 
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " un total de %d veces"
-
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
 msgstr ", terminando en "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
 msgstr "<b>Empieza:</b>"
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
 msgstr "<b>Termina:</b>"
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
 msgstr "<b>Completado:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
 msgstr "<b>Vencimiento:</b>"
 
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Información de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5992,316 +6008,316 @@ msgstr ""
 "<br> Revise la siguiente información y seleccione una acción del menú de "
 "abajo."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
-msgstr "<i>Ninguna<i>"
+msgstr "<i>Ninguna</i>"
 
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:930
 msgid "Location:"
 msgstr "Lugar:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
 msgid "Status:"
 msgstr "Estado:"
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:271
+#: calendar/gui/e-itip-control.c:949 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
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:272
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Rechazado"
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado información de reunión."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Información de reunió"
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita la presencia de %s en una reunión."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> solicita su presencia en una reunión."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reunión existente."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Actualización de reunión"
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la última información de la reunión."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Solicitud de actualización de la reunión"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ha contestado a la solicitud de reunión."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha cancelado una reunión."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Cancelación de reunión"
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ha publicado la información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pide a %s que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1262
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> le pide que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea añadirse a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quiere recibir la última información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Solicitud de actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ha contestado a una asignación de tarea."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Cancelación de tarea"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ha publicado la información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pide su información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Solicitud de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ha contestado a una solicitud de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sólo contiene solicitudes no soportadas."
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de agenda válido"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de agenda visibles"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
 msgstr "El archivo de agenda no pudo ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
 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"
 
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
 msgstr "El objeto es inválido y no puede ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "El estado de asistencia no pudo ser actualizado a causa de un estado "
 "inválido\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
 msgid "There was an error on the CORBA system\n"
 msgstr "Hubo un error en el sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
 msgstr "El objeto no pudo encontrarse\n"
 
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "No tiene los permisos necesarios para actualizar la agenda\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
 msgstr "El estado de asistencia no pudo ser actualizado.\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
 msgstr "Eliminación terminada"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo ser enviado.\n"
 
@@ -6347,7 +6363,7 @@ msgid "Chair Persons"
 msgstr "Presidencia"
 
 #: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:570
+#: calendar/gui/e-meeting-list-view.c:479
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
@@ -6359,57 +6375,57 @@ msgstr "Participantes opcionales"
 msgid "Resources"
 msgstr "Recursos"
 
-#: calendar/gui/e-meeting-list-view.c:231 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:232 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-list-view.c:233 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-list-view.c:234 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Sala"
 
-#: calendar/gui/e-meeting-list-view.c:245 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Presidente"
 
-#: calendar/gui/e-meeting-list-view.c:246 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Participante requerido"
 
-#: calendar/gui/e-meeting-list-view.c:247 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: calendar/gui/e-meeting-list-view.c:248 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "No participan"
 
-#: calendar/gui/e-meeting-list-view.c:270 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Necesita acción"
 
-#: calendar/gui/e-meeting-list-view.c:273 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Provisional"
 
-#: calendar/gui/e-meeting-list-view.c:274 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegado"
@@ -6531,7 +6547,7 @@ msgstr "Página web:"
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
 
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1903
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6541,7 +6557,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:792 calendar/gui/gnome-cal.c:1924
+#: calendar/gui/e-tasks.c:792
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6578,37 +6594,36 @@ msgstr "Terminando tareas..."
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados..."
 
-#: calendar/gui/e-tasks.c:1062
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
 msgstr "Compactando"
 
-#: calendar/gui/gnome-cal.c:1738
-#, c-format
-msgid "Loading tasks at %s"
-msgstr "Cargando tareas de %s"
-
-#: calendar/gui/gnome-cal.c:1750
+#: calendar/gui/gnome-cal.c:1758
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: calendar/gui/gnome-cal.c:1783
+#: calendar/gui/gnome-cal.c:1777
+#, c-format
+msgid "Loading tasks at %s"
+msgstr "Cargando tareas de %s"
+
+#: calendar/gui/gnome-cal.c:1797
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: calendar/gui/gnome-cal.c:1932
+#: calendar/gui/gnome-cal.c:1926
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
-msgstr ""
-"El backend de la agenda para\n"
-"%s\n"
-"se ha colgado."
+msgid "The calendar backend for '%s' has crashed."
+msgstr "El backend de la agenda para %s se ha colgado."
 
-#: calendar/gui/gnome-cal.c:2776
+#: calendar/gui/gnome-cal.c:1938
+#, 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:2752
 msgid "Purging"
 msgstr "Compactando"
 
@@ -6756,7 +6771,7 @@ msgid "Birthdays & Anniversaries"
 msgstr "Cumpleaños y aniversarios"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446
 msgid "On The Web"
 msgstr "En la web"
 
@@ -9206,7 +9221,7 @@ msgid ""
 "unrecognized by the implementation."
 msgstr ""
 "El mecanismo especificado no está soportado por la credencial provista, o es "
-"irreconocible por la implementación."
+"ireconocible por la implementación."
 
 #: camel/camel-sasl-gssapi.c:153
 msgid "The provided target_name parameter was ill-formed."
@@ -9233,7 +9248,7 @@ msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
-"input_tolen contiene una firma inválida, o una firma que no pudo ser "
+"input_token contiene una firma inválida, o una firma que no pudo ser "
 "verificada."
 
 #: camel/camel-sasl-gssapi.c:169
@@ -9264,7 +9279,7 @@ msgstr "Las credenciales referenciadas han expirado."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1193
+#: camel/providers/imap/camel-imap-store.c:1198
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
@@ -9480,7 +9495,8 @@ msgstr "No se pudo borrar la carpeta: %s: Operación no válida"
 msgid "Trash"
 msgstr "Papelera"
 
-#: camel/camel-store.c:775 filter/libfilter-i18n.h:35 mail/mail-ops.c:1083
+#: camel/camel-store.c:775 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
 #: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
@@ -9756,31 +9772,31 @@ msgstr ""
 msgid "Automatically synchronize remote mail locally"
 msgstr "Sincronizar automáticamente el correo remoto localmente"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
-msgstr "Nombre del servidor LDAP:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book And Calendar"
+msgstr "Libreta de direcciones y agenda"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Search base:"
-msgstr "Base de búsqueda:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
+msgid "Post Office Agent SOAP Port:"
+msgstr "Puerto del agente de la oficina de correos SOAP:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:83
+#: camel/providers/groupwise/camel-groupwise-provider.c:80
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
 msgstr "Para acceder a servidores Novell Groupwise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
 msgstr "Contraseña"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -9788,20 +9804,20 @@ msgstr ""
 "Esta opción conectará con el servidor IMAP usando una contraseña de texto "
 "plano."
 
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Checklist"
 msgstr "Lista de comprobación"
 
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2860
+#: camel/providers/imap/camel-imap-store.c:2902
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2863
+#: camel/providers/imap/camel-imap-store.c:2905
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconectó inesperadamente: %s"
@@ -9859,12 +9875,12 @@ msgstr "La carpeta fue destruida y recreada en el servidor."
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1926
+#: camel/providers/imap/camel-imap-folder.c:1924
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "No se pudo descargar el mensaje: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1972
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9880,25 +9896,25 @@ msgstr ""
 "No se pudo obtener el mensaje; %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1972
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "No existe ese mensaje"
 
-#: camel/providers/imap/camel-imap-folder.c:1995
-#: camel/providers/imap/camel-imap-folder.c:2591
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:2255
-#: camel/providers/imap/camel-imap-folder.c:2325
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo información de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:2629
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
 msgstr "No se pudo encontrar el cuerpo del mensaje en la respuesta de FETCH."
 
@@ -9957,7 +9973,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:66
 msgid "Check new messages for Junk contents"
-msgstr "Comprobar si el contenid de los mensajes nuevos es spam"
+msgstr "Comprobar si el contenido de los mensajes nuevos es spam"
 
 #: camel/providers/imap/camel-imap-provider.c:68
 msgid "Only check for Junk messages in the INBOX folder"
@@ -9972,17 +9988,21 @@ 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:425
+#: camel/providers/imap4/camel-imap-store.c:141
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
 #: camel/providers/imap/camel-imap-store.c:427
+#: camel/providers/imap4/camel-imap-store.c:143
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servicio IMAP para %s en %s"
 
 #: camel/providers/imap/camel-imap-store.c:547
 #: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap-store.c:184
+#: camel/providers/imap4/camel-imap-store.c:201
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -9993,13 +10013,15 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "No se pudo conectar con %s (puerto %d): %s"
 
 #: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap-store.c:186
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL no disponible"
 
 #: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:796
+#: camel/providers/imap/camel-imap-store.c:801
+#: camel/providers/imap4/camel-imap-store.c:198
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10007,49 +10029,50 @@ msgstr "SSL no disponible"
 msgid "Connection cancelled"
 msgstr "Conexión cancelada"
 
-#: camel/providers/imap/camel-imap-store.c:630
-#: camel/providers/imap/camel-imap-store.c:661
+#: camel/providers/imap/camel-imap-store.c:635
+#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap4/camel-imap-store.c:262
 #, 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:631
+#: camel/providers/imap/camel-imap-store.c:636
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Extensión SSL/TLS no implementada."
 
-#: camel/providers/imap/camel-imap-store.c:662
+#: camel/providers/imap/camel-imap-store.c:667
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Falló la negociación SSL"
 
-#: camel/providers/imap/camel-imap-store.c:799
+#: camel/providers/imap/camel-imap-store.c:804
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "No se pudo conectar con el comando «%s»: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1223
+#: camel/providers/imap/camel-imap-store.c:1228
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "El servidor IMAP %s no soporta el método de autenticación requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:1233
+#: camel/providers/imap/camel-imap-store.c:1238
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No hay soporte para el tipo de autenticación %s"
 
-#: camel/providers/imap/camel-imap-store.c:1256
+#: camel/providers/imap/camel-imap-store.c:1261
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s escriba la contraseña IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1275
 msgid "You didn't enter a password."
 msgstr "No introdujo una contraseña."
 
-#: camel/providers/imap/camel-imap-store.c:1299
+#: camel/providers/imap/camel-imap-store.c:1304
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10060,13 +10083,22 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1717
-#: camel/providers/imap/camel-imap-store.c:1798
+#: camel/providers/imap/camel-imap-store.c:1723
+#: camel/providers/imap/camel-imap-store.c:1817
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1739
+#: camel/providers/imap/camel-imap-store.c:1734
+#: camel/providers/imap/camel-imap-store.c:2023
+#: camel/providers/imap4/camel-imap-store.c:611
+#, 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 no puede contener el "
+"carácter de retorno de carro «%c»"
+
+#: camel/providers/imap/camel-imap-store.c:1758
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10074,22 +10106,122 @@ msgstr "No existe la carpeta %s"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "No se pudo crear la carpeta: %s: la carpeta existe."
 
-#: camel/providers/imap/camel-imap-store.c:1999
-#, 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 no puede contener el "
-"carácter de retorno de carro «%c»"
-
-#: camel/providers/imap/camel-imap-store.c:2011
+#: camel/providers/imap/camel-imap-store.c:2035
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Carpeta padre desconocida: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2047
+#: camel/providers/imap/camel-imap-store.c:2071
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 
+#: camel/providers/imap4/camel-imap-command.c:629
+#, c-format
+msgid "Unexpected response from IMAP server %s: %s"
+msgstr "Respuesta inesperada del servidor IMAP %s: %s"
+
+#: camel/providers/imap4/camel-imap-engine.c:410
+#, 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-imap-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "No se pudo seleccionar la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap-engine.c:1134
+#: camel/providers/imap4/camel-imap-engine.c:1523
+#: camel/providers/imap4/camel-imap-engine.c:1550
+#: camel/providers/imap4/camel-imap-engine.c:1580
+#: camel/providers/imap4/camel-imap-engine.c:1620
+#: camel/providers/imap4/camel-imap-utils.c:289
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "El servidor IMAP %s se desconectó inesperadamente: %s"
+
+#: camel/providers/imap4/camel-imap-engine.c:1135
+msgid "Got BYE response"
+msgstr "Se obtuvo una respuesta BYE"
+
+#: camel/providers/imap4/camel-imap-store.c:237
+#, 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-imap-store.c:349
+#, 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-imap-store.c:394
+#, 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-imap-store.c:468
+#, 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-imap-store.c:647
+#, 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-imap-store.c:652
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "No se pudo crear la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap-store.c:674
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "No se pudo borrar la carpeta «%s»: Carpeta especial"
+
+#: camel/providers/imap4/camel-imap-store.c:703
+#, 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-imap-store.c:708
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "No se pudo borrar la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap-store.c:766
+#, 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-imap-store.c:771
+#, 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-imap-store.c:810
+#, 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-imap-store.c:815
+#, 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-imap-utils.c:83
+#, 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-imap-utils.c:106
+msgid "No data"
+msgstr "Sin datos"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10319,21 +10451,21 @@ msgstr "no es un directorio tipo maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "No se pudo analizar la carpeta «%s»: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "No se pudo abrir el maildir en esta ruta: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "Comprobando la consistencia de la carpeta"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
@@ -10725,7 +10857,7 @@ 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 xomp.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"
@@ -10898,7 +11030,7 @@ msgstr "Borrar tras %s día(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Deshabilitar soporte para todas las extensiones POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -10987,7 +11119,7 @@ msgid "No such folder `%s'."
 msgstr "No existe la carpeta «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11039,13 +11171,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entregar correo por medio de sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Para enviar correo conectándose a un servidor de correo usando SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr "Para entregar correo conectándose a un servidor de correo usando SMTP."
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
@@ -11089,7 +11221,7 @@ msgstr "Acción de correo requerida en orden, completada"
 
 #: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
-msgstr "El usuario no es local: lo reenviaré a <forward-path>"
+msgstr "El usuario no es local; lo reenviaré a <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
@@ -11105,7 +11237,7 @@ msgstr "Acción solicitada abortada: error en procesamiento"
 
 #: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
-msgstr "El usuario no es local: pruebe con <forward-path>"
+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"
@@ -11164,7 +11296,7 @@ msgstr "el servidor no parece soportar SSL"
 #: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "STARTTLS command failed: %s"
-msgstr "El comando STARTTSL ha fallado: %s"
+msgstr "El comando STARTTLS ha fallado: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
 msgid "STARTTLS command failed"
@@ -11568,7 +11700,7 @@ msgstr "Abrir archivo"
 msgid "Signature:"
 msgstr "Firma"
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1311
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1317
 msgid "Autogenerated"
 msgstr "Auto-generado"
 
@@ -11620,7 +11752,7 @@ 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:4234
+#: composer/e-msg-composer.c:4239
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11928,7 +12060,7 @@ msgstr "Debe elegir una fecha."
 
 #: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
-msgstr "<pinche aquí para añadir una fecha>"
+msgstr "<pulse aquí para seleccionar una fecha>"
 
 #: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
@@ -11966,7 +12098,7 @@ msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
 #: filter/filter-folder.c:243 filter/vfolder-rule.c:507
-#: mail/mail-account-gui.c:1147
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -11980,19 +12112,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:66
+#: mail/mail-config.c:63 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Tareas pendientes"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Más tarde"
 
@@ -12307,8 +12439,8 @@ msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Redirigir mensaje a orden de shell"
+msgid "Pipe to Program"
+msgstr "Encauzar al programa"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12342,23 +12474,23 @@ msgstr "devuelve mayor que"
 msgid "returns less than"
 msgstr "devuelve menor que"
 
-#: filter/libfilter-i18n.h:53 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:53
+msgid "Run Program"
+msgstr "Ejecutar programa"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuación"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Sender"
 msgstr "Remitente"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Comando de shell"
-
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Tamaño (Kib)"
@@ -12385,7 +12517,7 @@ msgstr "Parar el proceso"
 
 #: filter/libfilter-i18n.h:64 mail/em-format-html.c:1512
 #: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Asunto"
@@ -12516,7 +12648,7 @@ msgstr "Correo"
 msgid "Mail Accounts"
 msgstr "Cuentas de correo"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
@@ -12541,28 +12673,28 @@ msgstr "Nombre de la cuenta"
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
+#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:352
 #: mail/mail-config.c:1252
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:336
 msgid "You must specify a valid script name."
 msgstr "Debe especificar un nombre de script válido."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
+#: mail/em-composer-prefs.c:394 mail/em-composer-prefs.c:456
 msgid "[script]"
 msgstr " [guión]"
 
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:878
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: mail/em-composer-prefs.c:922
+#: mail/em-composer-prefs.c:926
 msgid "Add script signature"
 msgstr "Añadir script de firma"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:946
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
@@ -12649,7 +12781,7 @@ msgstr "Mensajes no leídos"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
-msgstr "<pinche aquí para seleccionar una carpeta>"
+msgstr "<pulse aquí para seleccionar una carpeta>"
 
 #: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
@@ -12933,7 +13065,7 @@ msgstr "Filtro según la conversación"
 
 #. default charset used in mail view
 #: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -13129,7 +13261,7 @@ msgstr "Formateando el mensaje"
 
 #: mail/em-format-html.c:1406 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
 msgstr "De"
 
@@ -13195,7 +13327,7 @@ msgstr "Error interno: se esperaba CamelMultipart, se obtuvo «%s»"
 
 #: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tipo de cifrado no soportado para multipart/encripyed"
+msgstr "Tipo de cifrado no soportado para multipart/encrypted"
 
 #: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
@@ -13258,7 +13390,7 @@ msgstr "Falló  al migrar las cachés de identificación de usuario pop3 : %s"
 #: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
-msgstr "Falló  al migrar el extado de expansión de la carpeta : %s"
+msgstr "Falló  al migrar el estado de expansión de la carpeta : %s"
 
 #: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
@@ -13317,11 +13449,11 @@ msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:831
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:852
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
@@ -13554,8 +13686,7 @@ msgid ""
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 "Lista de cuentas conocidas para el componente de correo de Evolution. La "
-"lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
-"mail/accounts."
+"lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/mail/accounts."
 
 #: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of custom headers and whether they are enabled."
@@ -13666,7 +13797,7 @@ msgstr "Preguntar cuando el usuario compacta"
 
 #: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user only fills Bcc"
-msgstr "Preguntar cuando el usuario sólo rellena el campo CCo"
+msgstr "Preguntar cuando el usuario sólo rellena el campo Cco"
 
 #: mail/evolution-mail.schemas.in.in.h:55
 msgid ""
@@ -13876,7 +14007,7 @@ msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:103
 msgid "port for starting user runned spamd"
-msgstr "puerto pariniciar el spamd ejecutado por el usuario"
+msgstr "puerto para iniciar el spamd ejecutado por el usuario"
 
 #: mail/evolution-mail.schemas.in.in.h:104
 msgid "spamd port"
@@ -13950,7 +14081,7 @@ msgstr "Carpeta de destino:"
 
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder to import into"
-msgstr "Seleccione la carpeta enla que importar"
+msgstr "Seleccione la carpeta en la que importar"
 
 #: mail/importers/evolution-mbox-importer.c:219
 #: mail/importers/evolution-outlook-importer.c:224
@@ -14074,63 +14205,28 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Formato de almacenamiento actual:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Indexar contenido del cuerpo"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Formato de almacenamiento nuevo:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-"Nota: Cuando se convierte entre distintos formatos de buzón de correo, "
-"puede\n"
-"que un fallo (como la falta de disco) no sea recuperable automáticamente.\n"
-"Por favor use esta opción con cuidado."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
 #: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:140
+#: mail/mail-account-editor.c:145
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:790 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:794 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Nombre de usuario:"
 
-#: mail/mail-account-gui.c:798 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-account-gui.c:2074
+#: mail/mail-account-gui.c:2086
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
@@ -14210,7 +14306,7 @@ msgstr "Crea una carpeta de correo nueva"
 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:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identidad"
 
@@ -14225,6 +14321,7 @@ msgstr ""
 "información en el correo-e que envíe."
 
 #: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Recibiendo correo"
 
@@ -14241,7 +14338,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Por favor selecciona entre las siguientes opciones"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:387 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
@@ -14254,7 +14351,7 @@ msgstr ""
 "no está seguro, pregúntele a su administrador de sistemas o a su Proveedor "
 "de Servicios de Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
@@ -14280,115 +14377,227 @@ msgstr "Comprobando el servicio"
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+msgid " Ch_eck for Supported Types "
 msgstr "_Comprobar tipos soportados "
 
+#: mail/mail-config.glade.h:3
+msgid "<b>Preview</b>"
+msgstr "<b>Vista previa</b>"
+
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr "(SSL no está soportado en esta compilación de Evolution)"
+msgid "<b>SSL is not supported in this build of evolution</b>"
+msgstr "<b>SSL no está soportado en esta compilación de Evolution</b>"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL no está implementado en esta compilación de Evolution)"
+msgid "<b>S_ignatures</b>"
+msgstr "<b>_Firmas</b>"
+
+#: mail/mail-config.glade.h:6
+msgid "<b>_Languages</b>"
+msgstr "<b>_Idiomas</b>"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "<b>Cabeceras de correo _visibles</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr "<span weight=\"bold\">Información de la cuenta</span>"
 
 #: mail/mail-config.glade.h:8
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "_También cifrar a mí mismo cuando envíe correo cifrado"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">Alertas</span>"
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr "Editor de cuentas"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr "<span weight=\"bold\">Tipo de autenticación</span>"
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Información de la cuenta"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr "<span weight=\"bold\">Autenticación</span>"
+
+#: mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "<span weight=\"bold\">Comprobando si hay correo nuevo</span>"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "Añadir sc_ript"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr "<span weight=\"bold\">Redacción de mensajes</span>"
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "Añadir firma nueva..."
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr "<span weight=\"bold\">Configuración</span>"
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "S_iempre cifrarme a mí mismo cuando envíe correo cifrado"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr "<span weight=\"bold\">Comportamiento predeterminado</span>"
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr "<span weight=\"bold\">Borrar correo</span>"
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr "<span weight=\"bold\">Cabeceras de correo _mostradas</span>"
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "Siempre mandar copia de carbón oc_ulta (Cco) a:"
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr "<span weight=\"bold\">Opciones de filtros</span>"
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "Siempre mandar _copia de carbón (Cc) a:"
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">General</span>"
 
 #: mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Labels and Colors</span>"
+msgstr "<span weight=\"bold\">Etiquetas y colores</span>"
+
+#: mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr "<span weight=\"bold\">Cargando imágenes</span>"
+
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "<span weight=\"bold\">Mensaje a mostrar</span>"
+
+#: mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr "<span weight=\"bold\">Tipografías del mensaje</span>"
+
+#: mail/mail-config.glade.h:23
+msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgstr "<span weight=\"bold\">Notificación de correo nuevo</span>"
+
+#: mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr "<span weight=\"bold\">Información opcional</span>"
+
+#: mail/mail-config.glade.h:25
+msgid "<span weight=\"bold\">Options</span>"
+msgstr "<span weight=\"bold\">Opciones</span>"
+
+#: mail/mail-config.glade.h:26
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+
+#: mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr "<span weight=\"bold\">Tipografía para impresión</span>"
+
+#: mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr "<span weight=\"bold\">Información requerida</span>"
+
+#: mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr "<span weight=\"bold\">MIME seguro (S/MIME)</span>"
+
+#: mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Security</span>"
+msgstr "<span weight=\"bold\">Seguridad</span>"
+
+#: mail/mail-config.glade.h:31
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr "<span weight=\"bold\">Mensajes enviados y borradores</span>"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr "<span weight=\"bold\">Configuración del servidor</span>"
+
+#: mail/mail-config.glade.h:33
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr "_También cifrar a mí mismo cuando envíe correo cifrado"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Editor de cuentas"
+
+#: mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr "Añadir firma _nueva..."
+
+#: mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr "Añadir sc_ript"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "S_iempre cifrarme a mí mismo cuando envíe correo cifrado"
+
+#: mail/mail-config.glade.h:39
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Siempre mandar _copia de carbón (Cc) a:"
+
+#: mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Siempre mandar copia de carbón oc_ulta (Cco) a:"
+
+#: mail/mail-config.glade.h:42
+msgid "Always _sign outgoing messages when using this account"
+msgstr "_Firmar siempre el correo saliente al usar esta cuenta"
+
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Siempre _confiar en las claves de mi anillo cuando cifre"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Adjuntar mensaje original"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Autenticación"
+#: mail/mail-config.glade.h:46
+msgid "Automatically _insert smiley images"
+msgstr "_Insertar emoticonos automáticamente"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+msgid "Automatically check for _new mail every"
+msgstr "_Comprobar si hay correo nuevo automáticamente cada"
+
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+msgid "Beep w_hen new mail arrives"
+msgstr "Emitir un _pitido cuando llegue correo nuevo"
+
+#: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "Conjunto de carac_teres:"
 
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "C_olores"
+#: mail/mail-config.glade.h:52
+msgid "Ch_eck for Supported Types "
+msgstr "_Comprobar tipos soportados "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
 msgid "Check _Incoming Mail"
 msgstr "Comprobar si hay correo _entrante"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
 msgid "Check spelling while I _type"
 msgstr "Verificar orto_grafía mientras se escribe"
 
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Comprobando si hay correo nuevo"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Comprueba si el correo entrante es spam"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras _mal escritas"
 
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Redacción de mensajes"
+#: mail/mail-config.glade.h:57
+msgid "Colors"
+msgstr "Colores"
 
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Configuración"
+#: mail/mail-config.glade.h:58
+msgid "Confirm _when expunging a folder"
+msgstr "_Confirmar antes de compactar una carpeta"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14404,273 +14613,241 @@ msgstr ""
 "\n"
 "Pulse «Finalizar» para guardar su configuración."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Predeterminada"
 
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Comportamiento predefinido"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+msgid "Default character e_ncoding:"
 msgstr "_Codificación de caracteres predeterminada: "
 
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Borrado del correo"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Firm_ar digitalmente el correo saliente (por omisión)"
+#: mail/mail-config.glade.h:68
+msgid "Defaults"
+msgstr "Predeterminados"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "No citar el mensaje original"
 
-#: mail/mail-config.glade.h:48
+#: 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)"
 
-#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+msgid "Drafts _Folder:"
 msgstr "Carpeta de _borradores:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Cuentas de correo"
 
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+msgid "Email _Address:"
 msgstr "Dir_ección de correo:"
 
-#: mail/mail-config.glade.h:54
-msgid "Empty _trash folders on exit"
+#: mail/mail-config.glade.h:77
+msgid "Empty trash folders on e_xit"
 msgstr "Vaciar _papelera al salir"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Certificado de _cifrado:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed -width:"
 msgstr "A_nchura fija:"
 
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "Opciones de filtros"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Propiedades de tipografías"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Dar formato _HTML a los mensajes"
 
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
-msgstr "_Cabeceras"
+#: mail/mail-config.glade.h:85
+msgid "HTML Mail"
+msgstr "Correo en HTML"
+
+#: mail/mail-config.glade.h:86
+msgid "Headers"
+msgstr "Cabeceras"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "_Resaltar texto citado con este color:"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:88
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:91
 msgid "Inline"
 msgstr "Incluido en línea"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:93
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:69
-msgid "Labels and Colors"
-msgstr "Etiquetas y colores"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Carga de imágenes"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Localización del Mailbox"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Editor de mensajes"
 
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Pantalla del mensaje"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Tipografías del mensaje"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "Notificación de correo nuevo"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:101
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Nota: No se le pedirá una contraseña hasta que conecte por primera vez"
 
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Información opcional"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Elija un color"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+msgid "Play sound file when new mail arri_ves"
+msgstr "Reproducir un archivo de _sonido cuando llegue correo nuevo"
+
+#: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preguntar al mandar mensajes que tan sólo tengan definido el _Cco"
 
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
-
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
-msgstr "Tipografías impresas"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
 msgid "Quote original message"
 msgstr "Citar el mensaje original"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "Re_cuerda esta contraseña"
+#: mail/mail-config.glade.h:113
+msgid "Re_member password"
+msgstr "Recordar contraseña"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
-msgstr "_Opciones de recepción"
-
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "Recuerda esta co_ntraseña"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Información requerida"
+#: mail/mail-config.glade.h:117
+msgid "Receiving Options"
+msgstr "Opciones de recepción"
 
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Volver a predeterminados"
+#: mail/mail-config.glade.h:118
+msgid "Remember _password"
+msgstr "Recordar _contraseña"
 
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "S_eguridad"
+#: mail/mail-config.glade.h:120
+msgid "S_tandard Font:"
+msgstr "Tipografía _estándar:"
 
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "MIME seguro (S/MIME)"
+#: mail/mail-config.glade.h:121
+msgid "Security"
+msgstr "Seguridad"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+msgid "Select..."
+msgstr "Seleccione..."
+
+#: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Mensajes enviados y borradores"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Configuración del servidor"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "_Tipo de servidor:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
 msgid "Si_gning certificate:"
 msgstr "Certificado de _firma:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+msgid "Signat_ure:"
+msgstr "_Firma:"
+
+#: mail/mail-config.glade.h:135
+msgid "Signatures"
+msgstr "Firmas"
+
+#: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "Especificar nombre de a_rchivo:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
-msgstr "O_rtografía"
+#: mail/mail-config.glade.h:137
+msgid "Spell Checking"
+msgstr "Ortografía"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "Mailbox estándar de Unix"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+msgid "T_erminal Font:"
+msgstr "Tipografía del _terminal:"
+
+#: mail/mail-config.glade.h:140
+msgid "T_ype: "
+msgstr "_Tipo:"
+
+#: mail/mail-config.glade.h:141
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14680,7 +14857,7 @@ msgstr ""
 "firma. El nombre que especifique será usado\n"
 "únicamente para mostrarlo por pantalla."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:144
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -14690,7 +14867,7 @@ msgstr ""
 "y el idioma. La lista de idiomas de abajo refleja únicamente los idiomas "
 "para los cuales hay instalado un diccionario."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:146
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14698,15 +14875,15 @@ msgstr ""
 " Teclee el nombre por el que quiere identificar a esta cuenta.\n"
 " Por ejemplo: «Trabajo» o «Personal»"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
 msgid "Use _Daemon"
 msgstr "Usar _demonio"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "An_chura variable:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14716,167 +14893,95 @@ msgstr ""
 "\n"
 "Pulse «Adelante» para comenzar. "
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
 msgid "_Add Signature"
 msgstr "_Añadir firma"
 
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
-msgstr "C_argar siempre las imágenes desde la red"
-
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "Firm_ar siempre el correo saliente al usar esta cuenta"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "Tipo de _autenticación: "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "Tipo de _autenticación: "
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "Comprobar el correo _automáticamente cada"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "Insertar emoticonos _automáticamente"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "E_mitir un pitido cuando llegue correo nuevo"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "_Confirmar antes de compactar una carpeta"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "_Firma predeterminada:"
+#: mail/mail-config.glade.h:157
+msgid "_Always load images from the Internet"
+msgstr "Siempre cargar las imágenes desde Internet"
 
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "Pre_determinados"
+#: mail/mail-config.glade.h:158
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "Firmar _digitalmente los mensajes salientes (por omisión)"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
 msgstr "_No notificarme cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
 msgid "_Enable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Cifrar mensajes salientes (por omisión)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "Nombre _completo:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "Correo en _HTML"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Identidad"
-
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr "_Spam"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
 msgid "_Load images if sender is in address book"
 msgstr "_Cargar imágenes si el remitente está en la libreta de direcciones"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
 msgid "_Local Tests Only"
 msgstr "Pruebas _locales únicamente"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
 msgid "_Make this my default account"
 msgstr "_Hacer que ésta sea mi cuenta predeterminada"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leídos tras"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
-msgstr "_No cargar nunca imágenes desde la red"
-
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "Reproducir un archivo de _sonido cuando llegue correo nuevo"
+#: mail/mail-config.glade.h:171
+msgid "_Never load images from the Internet"
+msgstr "_Nunca cargar imágenes desde Internet"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Preguntar al mandar mensajes en HTML a contactos que no los quieren"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al mandar mensajes con el asunto vacío"
 
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Recepción de correo"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "_Restablecer predeterminados"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Script:"
 msgstr "_Guión:"
 
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "_Seleccionar..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "En_vío de correo"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "Mo_strar imágenes animadas"
 
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_Firmas"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "Tipografía _estándar"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "Tipografía del _terminal"
-
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
-msgstr "U_sar conexiones seguras (SSL)"
+msgid "_Use Secure Connection (SSL):"
+msgstr "U_sar conexión segura (SSL):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
+#: mail/mail-config.glade.h:180
+msgid "_minute(s)"
+msgstr "_minuto(s)"
+
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr " "
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "descripción"
 
@@ -15025,15 +15130,19 @@ msgstr "Obteniendo mensaje %s"
 
 #: mail/mail-ops.c:1838
 #, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Obteniendo %d mensajes(s)"
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Descargando %d mensaje"
+msgstr[1] "Descargando %d mensajes"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1924
 #, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Guardando %d mensaje(s)"
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Guardando %d mensaje"
+msgstr[1] "Guardando %d mensajes"
 
-#: mail/mail-ops.c:1970
+#: mail/mail-ops.c:1974
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15042,7 +15151,7 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2002
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15051,11 +15160,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:2073
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2090
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15064,17 +15173,17 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2268
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
@@ -15091,17 +15200,13 @@ msgstr "Buscar en mensaje"
 msgid "Find:"
 msgstr "Buscar:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "Buscar"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Firma digital</span>"
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr "Firma digital"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "Cifrado"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Cifrado</span>"
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
@@ -15407,7 +15512,7 @@ msgstr ""
 "Por favor, seleccione una acción de seguimiento desde el menú «Marcar»."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
+msgid "_Due By:"
 msgstr "_Vence el:"
 
 #: mail/message-tags.glade.h:7
@@ -15728,7 +15833,7 @@ msgstr "_Importar"
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
 msgstr "Preferencias de Evolution"
 
@@ -15811,11 +15916,11 @@ msgstr "Error ejecutando %s."
 
 #: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
-msgstr "Bug buddy no está instalado."
+msgstr "Bug Buddy no está instalado."
 
 #: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
-msgstr "No se ha podido ejecutar bug buddy."
+msgstr "No se ha podido ejecutar bug Buddy."
 
 #: shell/e-shell-window-commands.c:171
 msgid "About Ximian Evolution"
@@ -16180,30 +16285,30 @@ msgstr ""
 "%s: --online y --offline no pueden usarse a la vez.\n"
 "  use %s --help para más información\n"
 
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 msgid "Select a cert to import..."
 msgstr "Seleccionar un certificado para importar..."
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:545
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 msgid "Certificate Name"
 msgstr "Nombre del certificado"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 msgid "Purposes"
 msgstr "Propósito"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Número de serie"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
 msgstr "Caducidad"
 
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
 msgstr "Dirección de correo-e"
 
@@ -16212,17 +16317,17 @@ msgstr "Dirección de correo-e"
 msgid "Certificate Viewer: %s"
 msgstr "Visor de certificados: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Introduzca la contraseña para «%s»"
 
 #. we're setting the password initially
-#: smime/gui/component.c:64
+#: smime/gui/component.c:68
 msgid "Enter new password for certificate database"
 msgstr "Introduzca una contraseña nueva para  la base de datos de certificados"
 
-#: smime/gui/component.c:66
+#: smime/gui/component.c:70
 msgid "Enter new password"
 msgstr "Introduzca la contraseña nueva"
 
@@ -16247,7 +16352,7 @@ msgstr ""
 
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
-msgstr "<Sin parte de certificado>"
+msgstr "<No es parte del certificado>"
 
 #: smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
@@ -16416,7 +16521,8 @@ msgstr "Tiene certificados en el archivo que identifican a éstas personas:"
 msgid "Your Certificates"
 msgstr "Sus certificados:"
 
-#: smime/lib/e-cert-db.c:582
+#. 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"
 
@@ -16661,7 +16767,7 @@ msgstr "Cerrando %s (%s)\n"
 
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
-msgstr "Copia contact(os) a otra carpeta..."
+msgstr "Copia contacto(s) a otra carpeta..."
 
 #: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
@@ -18361,17 +18467,202 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
-#~ msgid "Send an Email"
-#~ msgstr "Envía un correo-e"
+#~ msgid "1 contact"
+#~ msgstr "1 contacto"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "y otros %d contactos."
+
+#~ msgid "List View"
+#~ msgstr "Vista de lista"
+
+#~ msgid "1 day"
+#~ msgstr "1 día"
+
+#~ msgid "1 week"
+#~ msgstr "1 semana"
+
+#~ msgid "1 hour"
+#~ msgstr "1 hora"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minuto"
+
+#~ msgid "1 second"
+#~ msgstr "1 segundo"
+
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
+#~ msgid "component"
+#~ msgstr "componente"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmas"
+
+#~ msgid "Geographical position"
+#~ msgstr "Posición geográfica"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "Cada %d días"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Cada %d semanas"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Cada %d semanas en"
+
+#~ msgid "every %d months"
+#~ msgstr "Cada %d meses"
+
+#~ msgid "Every %d years"
+#~ msgstr "Cada %d años"
+
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Nombre del servidor LDAP:"
+
+#~ msgid "Search base:"
+#~ msgstr "Base de búsqueda:"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Redirigir mensaje a orden de shell"
+
+#~ msgid "Shell Command"
+#~ msgstr "Comando de shell"
 
-#~ msgid "Select destination %s"
-#~ msgstr "Seleccione destino %s"
+#~ msgid "Current store format:"
+#~ msgstr "Formato de almacenamiento actual:"
 
-#~ msgid "calendar"
-#~ msgstr "agenda"
+#~ msgid "Index body contents"
+#~ msgstr "Indexar contenido del cuerpo"
 
-#~ msgid "task list"
-#~ msgstr "lista de tareas"
+#~ msgid "New store format:"
+#~ msgstr "Formato de almacenamiento nuevo:"
+
+#~ msgid ""
+#~ "Note: When converting between mailbox formats, a failure\n"
+#~ "(such as lack of disk space) may not be automatically\n"
+#~ "recoverable.  Please use this feature with care."
+#~ msgstr ""
+#~ "Nota: Cuando se convierte entre distintos formatos de buzón de correo, "
+#~ "puede\n"
+#~ "que un fallo (como la falta de disco) no sea recuperable "
+#~ "automáticamente.\n"
+#~ "Por favor use esta opción con cuidado."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL no está soportado en esta compilación de Evolution)"
+
+#~ msgid "Account Information"
+#~ msgstr "Información de la cuenta"
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticación"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Redacción de mensajes"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Comportamiento predefinido"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Borrado del correo"
+
+#~ msgid "Filter Options"
+#~ msgstr "Opciones de filtros"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Etiquetas y colores"
+
+#~ msgid "Loading Images"
+#~ msgstr "Carga de imágenes"
+
+#~ msgid "Message Display"
+#~ msgstr "Pantalla del mensaje"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Tipografías del mensaje"
+
+#~ msgid "Optional Information"
+#~ msgstr "Información opcional"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Tipografías impresas"
+
+#~ msgid "Re_member this password"
+#~ msgstr "Re_cuerda esta contraseña"
+
+#~ msgid "Remember this _password"
+#~ msgstr "Recuerda esta co_ntraseña"
+
+#~ msgid "Required Information"
+#~ msgstr "Información requerida"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Volver a predeterminados"
+
+#~ msgid "S_ecurity"
+#~ msgstr "S_eguridad"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "MIME seguro (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Configuración del servidor"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "Tipo de _autenticación: "
+
+#~ msgid "_Authentication type: "
+#~ msgstr "Tipo de _autenticación: "
+
+#~ msgid "_Default signature:"
+#~ msgstr "_Firma predeterminada:"
+
+#~ msgid "_Full name:"
+#~ msgstr "Nombre _completo:"
+
+#~ msgid "_Identity"
+#~ msgstr "_Identidad"
+
+#~ msgid "_Junk"
+#~ msgstr "_Spam"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Recepción de correo"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "_Restablecer predeterminados"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "En_vío de correo"
+
+#~ msgid "Search"
+#~ msgstr "Buscar"
+
+#~ msgid "Digital Signature"
+#~ msgstr "Firma digital"
+
+#~ msgid "Encryption"
+#~ msgstr "Cifrado"
+
+#~ msgid "Send an Email"
+#~ msgstr "Envía un correo-e"
 
 #~ msgid "STARTTLS request timed out: %s"
 #~ msgstr "Solicitud STARTTLS expiró: %s"
@@ -18836,9 +19127,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "<b>Alarm Sound</b>"
 #~ msgstr "<b>Sonido de la alarma</b>"
 
-#~ msgid "<b>Message to Display</b>"
-#~ msgstr "<b>Mensaje a mostrar</b>"
-
 #~ msgid "<b>Basics</b>"
 #~ msgstr "<b>Básico</b>"
 
@@ -18878,9 +19166,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Could not create directory for new task list"
 #~ msgstr "No se pudo crear el directorio para la lista de tareas nueva"
 
-#~ msgid "<b>Preview</b>"
-#~ msgstr "<b>Vista previa</b>"
-
 #~ msgid "<b>Progress</b>"
 #~ msgstr "<b>Progreso</b>"
 
@@ -19193,9 +19478,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "New _Task"
 #~ msgstr "_Tarea nueva"
 
-#~ msgid "Evolution _Window"
-#~ msgstr "_Ventana de Evolution"
-
 #~ msgid "Open a new Evolution window"
 #~ msgstr "Abre una ventana de Evolution nueva"
 
@@ -19565,9 +19847,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "No cards"
 #~ msgstr "Sin tarjetas"
 
-#~ msgid "1 card"
-#~ msgstr "1 tarjeta"
-
 #~ msgid "%d cards"
 #~ msgstr "%d tarjetas"
 
@@ -19636,9 +19915,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "_Save as..."
 #~ msgstr "_Guardar como..."
 
-#~ msgid "End Date"
-#~ msgstr "Fecha final"
-
 #~ msgid "Print..."
 #~ msgstr "Imprimir..."
 
@@ -27258,9 +27534,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Shown"
 #~ msgstr "Mostrados"
 
-#~ msgid "No tasks"
-#~ msgstr "No hay tareas"
-
 #~ msgid "(No Description)"
 #~ msgstr "(Sin descripción)"
 
@@ -28170,9 +28443,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Show temperatures in:"
 #~ msgstr "Mostrar temperaturas en:"
 
-#~ msgid "Tasks "
-#~ msgstr "Tareas "
-
 #~ msgid "Weather Settings"
 #~ msgstr "Configuración de meteorología"