Updated Spanish translation.

svn path=/trunk/; revision=9907

1 files changed, 1811 insertions, 1095 deletions

diff --git a/po/es.po b/po/es.po
index 6865b5ba96..873c81be68 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.7.0\n"
-"POT-Creation-Date: 2001-05-05 11:45+0200\n"
+"POT-Creation-Date: 2001-05-21 19:19+0200\n"
 "PO-Revision-Date: 2001-01-23 16:58-04:00\n"
 "Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/e-card.c:3314
 msgid "Card: "
 msgstr "Tarjeta: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3316
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +26,7 @@ msgstr ""
 "\n"
 "Nombre:"
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3317
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 "  Prefijo:    "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3318
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +42,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3319
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +50,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3320
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3321
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 "  Sufijo:     "
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3335
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "Fecha de nacimiento: "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3346
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +82,7 @@ msgstr ""
 "\n"
 "Dirección:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3348
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +90,7 @@ msgstr ""
 "\n"
 "  Dirección postal: "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3349
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +98,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3350
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +106,7 @@ msgstr ""
 "\n"
 "  Calle:       "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3351
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 "  Ciudad:      "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3352
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +122,7 @@ msgstr ""
 "\n"
 "  Región:      "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +130,7 @@ msgstr ""
 "\n"
 "  Código postal: "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +138,7 @@ msgstr ""
 "\n"
 "  País:        "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3367
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +146,7 @@ msgstr ""
 "\n"
 "Etiqueta de envío: "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +154,7 @@ msgstr ""
 "\n"
 "Teléfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3382
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +162,7 @@ msgstr ""
 "\n"
 "Teléfono:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3406
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +170,7 @@ msgstr ""
 "\n"
 "Correo electrónico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3409
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "Correo electrónico:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3428
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "Programa de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3434
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3442
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +202,7 @@ msgstr ""
 "\n"
 "Localización geográfica: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3446
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +210,7 @@ msgstr ""
 "\n"
 "Cargo: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3458
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +218,7 @@ msgstr ""
 "\n"
 "Organización: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3459
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +226,7 @@ msgstr ""
 "\n"
 "  Nombre: "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3460
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +234,7 @@ msgstr ""
 "\n"
 "  Unidad: "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3461
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +242,7 @@ msgstr ""
 "\n"
 "  Unidad2: "
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3462
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidad3: "
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3463
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidad4: "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3467
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +266,7 @@ msgstr ""
 "\n"
 "categorías: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3468
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +284,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3481
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +292,7 @@ msgstr ""
 "\n"
 "Cadena única: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3484
 msgid ""
 "\n"
 "Public Key: "
@@ -300,17 +300,26 @@ msgstr ""
 "\n"
 "Llave pública: "
 
-#: addressbook/backend/ebook/e-destination.c:232
+#: addressbook/backend/ebook/e-card.c:3745
+msgid "Multiple VCards"
+msgstr "VCards Múltiples"
+
+#: addressbook/backend/ebook/e-card.c:3753
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard para %s"
+
+#: addressbook/backend/ebook/e-destination.c:244
 msgid "???"
 msgstr "???"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Factoría para importar archivos de GnomeCard a Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Factoría para importar archivos VCard a Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importa archivos de GnomeCard a Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Importa archivos VCard a Evolution."
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
@@ -423,7 +432,7 @@ msgid "Web page address:"
 msgstr "Dirección de la página web:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:84
 msgid "_Add"
 msgstr "_Añadir"
 
@@ -448,9 +457,9 @@ msgid "_Company:"
 msgstr "_Compañía:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:639 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: mail/folder-browser.c:715 mail/mail-config.glade.h:85
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:103
+#: ui/evolution-task-editor-dialog.xml.h:69 ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -503,7 +512,7 @@ msgid "This contact belongs to these categories:"
 msgstr "Este contacto está en estas categorías:"
 
 #: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Assistant"
 msgstr "Asistente"
 
@@ -517,7 +526,7 @@ msgid "Business 2"
 msgstr "Trabajo 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
@@ -543,12 +552,12 @@ msgid "Home 2"
 msgstr "Casa 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Home Fax"
 msgstr "Fax de casa"
 
 #: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "ISDN"
 msgstr "RDSI"
 
@@ -558,17 +567,16 @@ msgstr "Móvil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1254
 #: addressbook/contact-editor/e-contact-editor.c:1312
-#: mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Otro"
 
 #: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Other Fax"
 msgstr "Otro fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "Pager"
 msgstr "Papel"
 
@@ -577,12 +585,12 @@ msgid "Primary"
 msgstr "Principal"
 
 #: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Telex"
 msgstr "Telex"
 
@@ -591,12 +599,12 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Email 2"
 msgstr "Correo electrónico 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "Email 3"
 msgstr "Correo electrónico 3"
 
@@ -613,7 +621,7 @@ msgid "Edit Full"
 msgstr "Editar Todo"
 
 #: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/widgets/e-addressbook-view.c:700
 msgid "Full Name"
 msgstr "Nombre Completo"
 
@@ -733,65 +741,67 @@ msgstr "_Sufijo:"
 msgid "_Title:"
 msgstr "_Título:"
 
-#: addressbook/gui/component/addressbook.c:241
+#: addressbook/gui/component/addressbook.c:244
 msgid "As _Minicards"
 msgstr "Como _mini tarjetas"
 
-#: addressbook/gui/component/addressbook.c:247
+#: addressbook/gui/component/addressbook.c:250
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Como _Tabla"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:410
 #, c-format
 msgid "Enter password for %s"
 msgstr "Introduzca la contraseña para %s"
 
-#: addressbook/gui/component/addressbook.c:435
+#: addressbook/gui/component/addressbook.c:438
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook.c:440
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"No podemos abrir esta agenda de direcciones. Esto puede\n"
-"significar que, o bien ha introducido un URI incorrecto,\n"
-"o que ha intentado acceder a un servidor LDAP y no ha\n"
-"compilado el soporte para LDAP. Si ha introducido un URI,\n"
-"compruébelo y reinténtelo. De no ser así, posiblemente a\n"
-"intentado acceder a un servidor LDAP. Si desea poder emplear\n"
-"LDAP, necesitará descargar e instalar OpenLDAP y recompilar\n"
-"e instalar evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:563 widgets/misc/e-filter-bar.h:95
-msgid "Show All"
-msgstr "Mostrar todo"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"No podemos abrir este agenda de direcciones.  Esto significa\n"
+"que ha introducido una URI erronea, o que el servidor LDAP está\n"
+"caido"
 
-#: addressbook/gui/component/addressbook.c:565
-msgid "Advanced..."
-msgstr "Avanzado..."
+#: addressbook/gui/component/addressbook.c:450
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Esta versión de Evolution no tiene soporte LDAP compilado.\n"
+"Si quiere usar LDAP en Evolution debe compilar el programa\n"
+"de las fuentes del CVS una vez que haya obtenido LDAP del\n"
+"siguiente enlace.\n"
+
+#: addressbook/gui/component/addressbook.c:458
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"No pudimos abrir esta agenda de direcciones.  Por favor compruebe\n"
+"que existe la ruta y que tiene permisos para acceder a ella."
 
-#: addressbook/gui/component/addressbook.c:595 calendar/gui/gnome-cal.c:236
+#: addressbook/gui/component/addressbook.c:618 calendar/gui/gnome-cal.c:233
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:596
+#: addressbook/gui/component/addressbook.c:619
 msgid "Name contains"
 msgstr "El nombre contiene"
 
-#: addressbook/gui/component/addressbook.c:597
+#: addressbook/gui/component/addressbook.c:620
 msgid "Email contains"
 msgstr "El mensaje contiene"
 
-#: addressbook/gui/component/addressbook.c:740
+#: addressbook/gui/component/addressbook.c:763
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrará el visor de carpetas"
 
@@ -814,102 +824,102 @@ msgstr "Ninguno (modo anónimo)"
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Clave"
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
+#: addressbook/gui/component/addressbook-config.c:168
 msgid "Unknown auth type"
 msgstr "Tipo de autentificación desconocido"
 
-#: addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/component/addressbook-config.c:177
 msgid "Base"
 msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "One"
 msgstr "Uno"
 
-#: addressbook/gui/component/addressbook-config.c:183
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Subtree"
 msgstr "Sub-arbol"
 
-#: addressbook/gui/component/addressbook-config.c:186
+#: addressbook/gui/component/addressbook-config.c:184
 msgid "Unknown scope type"
 msgstr "Tipo de rango desconocido"
 
-#: addressbook/gui/component/addressbook-config.c:353
+#: addressbook/gui/component/addressbook-config.c:349
 msgid "Bind DN:"
 msgstr "Asociar DN:"
 
-#: addressbook/gui/component/addressbook-config.c:354
+#: addressbook/gui/component/addressbook-config.c:350
 msgid "FIXME Bind DN Help text here"
 msgstr "FIXME Bind DN Help text here"
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:60
 msgid "Remember this password"
 msgstr "Recuerda esta contraseña"
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:33
 msgid "Host:"
 msgstr "Servidor:"
 
-#: addressbook/gui/component/addressbook-config.c:407
+#: addressbook/gui/component/addressbook-config.c:404
 msgid "FIXME Host help text here."
 msgstr "FIXME Host help text here."
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Puerto:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr "FIXME Port help text here."
-
-#: addressbook/gui/component/addressbook-config.c:414
+#: addressbook/gui/component/addressbook-config.c:406
 msgid "Root DN:"
 msgstr "DN raíz:"
 
-#: addressbook/gui/component/addressbook-config.c:415
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Root DN help text here."
 msgstr "FIXME Root DN help text here."
 
-#: addressbook/gui/component/addressbook-config.c:435
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Puerto:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Port help text here."
+
+#: addressbook/gui/component/addressbook-config.c:432
 msgid "Search Scope:"
 msgstr "Rango de búsqueda:"
 
-#: addressbook/gui/component/addressbook-config.c:489
+#: addressbook/gui/component/addressbook-config.c:479
 msgid "Authentication:"
 msgstr "Autentificación:"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Opciones avanzadas de LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:53
 msgid "Path:"
 msgstr "Ruta:"
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:523
 msgid "FIXME Path Help text here"
 msgstr "FIXME Path Help text here"
 
-#: addressbook/gui/component/addressbook-config.c:513
+#: addressbook/gui/component/addressbook-config.c:528
 msgid "Create path if it doesn't exist."
 msgstr "Crear ruta si no existe."
 
-#: addressbook/gui/component/addressbook-config.c:647
+#: addressbook/gui/component/addressbook-config.c:662
 msgid "Edit Addressbook"
 msgstr "Editar agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.c:649
+#: addressbook/gui/component/addressbook-config.c:664
 msgid "Add Addressbook"
 msgstr "Añadir agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/component/addressbook-config.c:682
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -917,22 +927,22 @@ msgstr ""
 "Seleccione el tipo de agenda de direcciones que tiene, e introduzca la "
 "información relevante acerca de ella."
 
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
+#: addressbook/gui/component/addressbook-config.c:688
+#: mail/mail-config.glade.h:43
 msgid "Name:"
 msgstr "Nombre:"
 
-#: addressbook/gui/component/addressbook-config.c:672
+#: addressbook/gui/component/addressbook-config.c:689
 msgid "FIXME Name help text here"
 msgstr "FIXME Name help text here"
 
-#: addressbook/gui/component/addressbook-config.c:674
+#: addressbook/gui/component/addressbook-config.c:691
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Descripción:"
 
-#: addressbook/gui/component/addressbook-config.c:675
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Description help text here"
 msgstr "FIXME Description help text here"
 
@@ -941,20 +951,20 @@ msgid "Addressbook Sources"
 msgstr "Fuentes de la agenda de direcciones"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:616
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:23
+#: mail/message-browser.c:202 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
 #: ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Borrar"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:28
 msgid "Edit"
 msgstr "Editar"
 
@@ -979,12 +989,12 @@ msgid "Enable Queries (Dangerous!)"
 msgstr "Habilitar Consultas (¡Peligroso!)"
 
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
+#: addressbook/gui/component/select-names/e-select-names-popup.c:281
 msgid "Edit Contact Info"
 msgstr "Editar información de contacto"
 
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
+#: addressbook/gui/component/select-names/e-select-names-popup.c:347
 msgid "Add to Contacts"
 msgstr "Añadir a Contactos"
 
@@ -1032,17 +1042,21 @@ msgstr "Factoría para el componente de agenda de Evolution."
 msgid "Factory for the sample Addressbook control"
 msgstr "Factoría para el control de ejemplo de la Agenda"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: addressbook/gui/component/select-names/e-select-names-popup.c:161
 #: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
 #: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
 msgstr "Quitar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
+#: addressbook/gui/component/select-names/e-select-names-popup.c:176
 msgid "Remove All"
 msgstr "Quitar Todas"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Send HTML Mail?"
+msgstr "¿Enviar correo en HTML?"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Interfaz de Evolutión de selección de nombre de la agenda."
@@ -1068,6 +1082,7 @@ msgid "Select name from:"
 msgstr "Seleccionar nombre de:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:242
 msgid "Search"
 msgstr "Buscar"
 
@@ -1179,149 +1194,149 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:551
+#: addressbook/gui/widgets/e-addressbook-view.c:611
 msgid "Save as VCard"
 msgstr "Guardar como vCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:612
 msgid "Send contact to other"
 msgstr "Enviar el contacto a otro"
 
 #
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:613
 msgid "Send message to contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:614 mail/message-browser.c:199
 #: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: ui/evolution-mail.xml.h:65 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:615
 msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-view.c:698
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aquí para añadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:699
 msgid "File As"
 msgstr "Archivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Primary Phone"
 msgstr "Teléfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Assistant Phone"
 msgstr "Teléfono del Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Business Phone"
 msgstr "Teléfono del Trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Callback Phone"
 msgstr "Teléfono para rellamadas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Company Phone"
 msgstr "Teléfono de la compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Business Address"
 msgstr "Dirección del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Address"
 msgstr "Dirección de su casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Car Phone"
 msgstr "Teléfono del coche"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Business Phone 2"
 msgstr "Teléfono del trabajo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Home Phone 2"
 msgstr "Teléfono de casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Other Phone"
 msgstr "Otro teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Other Address"
 msgstr "Otra dirección"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Title"
 msgstr "Título"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Profession"
 msgstr "Profesión"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Manager"
 msgstr "Encargado"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Nickname"
 msgstr "Nick"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Spouse"
 msgstr "Cónyuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Free-busy URL"
 msgstr "URL de disponibilidad"
 
@@ -1329,7 +1344,7 @@ msgstr "URL de disponibilidad"
 msgid "Save in addressbook"
 msgstr "Guardar en la agenda de direcciones"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:216
 msgid ""
 "\n"
 "\n"
@@ -1587,23 +1602,23 @@ msgid ""
 msgstr "No pude mostrar el calendario.  Por favor compruebe su ORBit y su OAF."
 
 #: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/e-calendar-table.c:323
 msgid "Public"
 msgstr "Público"
 
 #: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:324
 msgid "Private"
 msgstr "Privado"
 
 #: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/e-calendar-table.c:325
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1628
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -1625,54 +1640,54 @@ msgstr "W"
 
 #: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:691
+#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:689
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
 #: calendar/gui/calendar-model.c:1574
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:690
+#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:688
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:689
+#: calendar/gui/e-calendar-table.c:347 mail/message-list.c:687
 msgid "Low"
 msgstr "Baja"
 
 #: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:399
 msgid "Transparent"
 msgstr "Transparente"
 
 #: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:398
 msgid "Opaque"
 msgstr "Opaco"
 
 #: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:419
 msgid "Not Started"
 msgstr "Sin comenzando"
 
 #: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:420
 msgid "In Progress"
 msgstr "En proceso"
 
 #: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:421
 msgid "Completed"
 msgstr "Completado"
 
 #: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:422 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Cancelar"
@@ -1706,10 +1721,10 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
+#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:322
+#: calendar/gui/e-calendar-table.c:397 mail/mail-account-gui.c:976
 #: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1198
+#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1312
 #: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
 #: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
 msgid "None"
@@ -1736,7 +1751,7 @@ msgstr "La prioridad debe ser 'Alta', 'Normal', 'Baja' o 'Indefinida'"
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1064
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:348
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -1785,7 +1800,7 @@ msgstr "<b>Error cargando el calendario</b>"
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Error cargando el calendario:<br>Método no soportado"
 
-#: calendar/gui/calendar-summary.c:622
+#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:24
 msgid "Display"
 msgstr "Mostrar"
 
@@ -1824,7 +1839,7 @@ msgstr "No hay un sumario disponible."
 #: calendar/gui/dialogs/alarm-notify.glade.h:1
 #: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1906,7 +1921,7 @@ msgid "Display options"
 msgstr "Mostrar opciónes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:155
 msgid "Due Date"
 msgstr "Fecha de plazo"
 
@@ -1927,7 +1942,7 @@ msgid "Fri"
 msgstr "Vier"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/event-editor.c:479
 msgid "Friday"
 msgstr "Viernes"
 
@@ -1956,7 +1971,7 @@ msgid "Mon"
 msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:475
 msgid "Monday"
 msgstr "Lunes"
 
@@ -1969,12 +1984,12 @@ msgid "Overdue Items:"
 msgstr "Elementos fuera de plazo:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:54
 msgid "Pick a color"
 msgstr "Elije un color"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:158
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -1992,7 +2007,7 @@ msgid "Sat"
 msgstr "Sab"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/event-editor.c:480
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -2017,7 +2032,7 @@ msgid "Sun"
 msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/event-editor.c:481
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -2030,7 +2045,7 @@ msgid "Thu"
 msgstr "Jue"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/event-editor.c:478
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -2051,7 +2066,7 @@ msgid "Tue"
 msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:476
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -2064,7 +2079,7 @@ msgid "Wed"
 msgstr "Mier"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/event-editor.c:477
 msgid "Wednesday"
 msgstr "Miércoles"
 
@@ -2077,71 +2092,83 @@ msgid "minutes before they occur."
 msgstr "minutos antes de que ocurra."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:88
 msgid "seconds."
 msgstr "segundos."
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "¿Esta seguro que quiere borrar la cita `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "¿Esta seguro que quiere borrar esta cita sin título?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "¿Esta seguro que quiere borrar la tarea `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "¿Esta seguro que quiere borrar esta tarea sin título?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "¿Esta seguro que quiere borrar la entrada del diario `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "¿Esta seguro que quiere borrar esta entrada del diario sin título?"
 
+#: calendar/gui/dialogs/delete-comp.c:120
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "¿Esta seguro que quiere borrar %d citas?"
+
+#: calendar/gui/dialogs/delete-comp.c:125
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "¿Esta seguro que quiere borrar %d tareas?"
+
+#: calendar/gui/dialogs/delete-comp.c:130
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "¿Esta seguro que quiere borrar %d entradas del diario?"
+
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "¿Desea guardar los cambios?"
 
-#: calendar/gui/dialogs/task-editor.c:707
+#: calendar/gui/dialogs/task-editor.c:709
 msgid "Edit Task"
 msgstr "Editar Tarea"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Sin resumen"
-
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
+#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
+#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
+msgid "No summary"
+msgstr "Sin resumen"
+
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:2
 #, no-c-format
 msgid "% Comp_lete:"
 msgstr "% Comp_leto:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:151
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Clasificación"
@@ -2208,129 +2235,125 @@ msgstr "_Prioridad:"
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:150
 msgid "Categories"
 msgstr "Categorías"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:152
 msgid "Completion Date"
 msgstr "Fecha de vencimiento"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:153
 msgid "End Date"
 msgstr "Fecha fin"
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:154
 msgid "Start Date"
 msgstr "Fecha de Inicio"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:156
 msgid "Geographical Position"
 msgstr "Posición geográfica"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:157
 msgid "Percent complete"
 msgstr "Porcentaje completado"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:159
 msgid "Summary"
 msgstr "Resumen"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:160
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:161
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:162
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.c:170
+#: calendar/gui/e-calendar-table.c:163
 msgid "Click here to add a task"
 msgstr "Pulse aquí para añadir una tarea"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:367
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:368
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:369
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:370
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:371
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:372
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:373
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Marcar como completa"
-
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Marcar la tarea como completa"
-
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Editar esta tarea..."
+#: calendar/gui/e-calendar-table.c:705
+msgid "Edit this task"
+msgstr "Editar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Editar la tarea"
+#: calendar/gui/e-calendar-table.c:707
+msgid "Mark as complete"
+msgstr "Marcar como completa"
 
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:708
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Borrar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
-msgstr "Borrar la tarea"
+#: calendar/gui/e-calendar-table.c:713
+msgid "Mark tasks as complete"
+msgstr "Marcar tareas como completas"
+
+#: calendar/gui/e-calendar-table.c:714
+msgid "Delete selected tasks"
+msgstr "Borrar las tareas seleccionadas"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
@@ -2369,37 +2392,37 @@ msgstr "%d de %b"
 msgid "New Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3279
 msgid "New All Day Event"
 msgstr "Nuevo evento para todo el día"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3284
 msgid "Go to Today"
 msgstr "Ir a hoy"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3286
 msgid "Go to Date..."
 msgstr "Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
+#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3292
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Abrir"
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3294
 msgid "Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
+#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3296
 #: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr "Concertar encuentro"
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3309
 msgid "Make this Occurrence Movable"
 msgstr "Hacer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3311
 msgid "Delete this Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
@@ -2493,7 +2516,7 @@ msgstr "--to--"
 msgid "Calendar Message"
 msgstr "Mensaje del Calendario"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Fecha:"
 
@@ -2598,7 +2621,7 @@ msgstr ""
 "Hora"
 
 #: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1083
+#: mail/message-list.c:1081
 msgid "Status"
 msgstr "Estado"
 
@@ -2621,116 +2644,116 @@ msgstr "No puedo cargar las tareas en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "El método necesario para cargar `%s' no esta soportado"
 
-#: calendar/gui/event-editor.c:376
+#: calendar/gui/event-editor.c:377
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/event-editor.c:454
+#: calendar/gui/event-editor.c:449
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/event-editor.c:606
+#: calendar/gui/event-editor.c:601
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/event-editor.c:613
+#: calendar/gui/event-editor.c:608
 msgid "th"
 msgstr "º"
 
-#: calendar/gui/event-editor.c:759
+#: calendar/gui/event-editor.c:754
 msgid "occurrences"
 msgstr "ocurrencias"
 
-#: calendar/gui/event-editor.c:876
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
 
-#: calendar/gui/event-editor.c:1548
+#: calendar/gui/event-editor.c:1543
 #, c-format
 msgid " %d days"
 msgstr "%d días"
 
-#: calendar/gui/event-editor.c:1550
+#: calendar/gui/event-editor.c:1545
 msgid " 1 day"
 msgstr " 1 día"
 
-#: calendar/gui/event-editor.c:1553
+#: calendar/gui/event-editor.c:1548
 #, c-format
 msgid " %d weeks"
 msgstr " %d semanas"
 
-#: calendar/gui/event-editor.c:1555
+#: calendar/gui/event-editor.c:1550
 msgid " 1 week"
 msgstr " 1 semana"
 
-#: calendar/gui/event-editor.c:1558
+#: calendar/gui/event-editor.c:1553
 #, c-format
 msgid " %d hours"
 msgstr " %d horas"
 
-#: calendar/gui/event-editor.c:1560
+#: calendar/gui/event-editor.c:1555
 msgid " 1 hour"
 msgstr " 1 hora"
 
-#: calendar/gui/event-editor.c:1563
+#: calendar/gui/event-editor.c:1558
 #, c-format
 msgid " %d minutes"
 msgstr " %d minutos"
 
-#: calendar/gui/event-editor.c:1565
+#: calendar/gui/event-editor.c:1560
 msgid " 1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/event-editor.c:1568
+#: calendar/gui/event-editor.c:1563
 #, c-format
 msgid " %d seconds"
 msgstr " %d segundos"
 
-#: calendar/gui/event-editor.c:1570
+#: calendar/gui/event-editor.c:1565
 msgid " 1 second"
 msgstr " 1 segundo"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
+#: calendar/gui/event-editor.c:1588
 msgid "Play a sound"
 msgstr "Tocar un sonido"
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
+#: calendar/gui/event-editor.c:1591
 msgid "Show a dialog"
 msgstr "Mostrar un diálogo"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
+#: calendar/gui/event-editor.c:1594
 msgid "Send an email"
 msgstr "Enviar un correo"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
+#: calendar/gui/event-editor.c:1597
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
-#: calendar/gui/event-editor.c:1617
+#: calendar/gui/event-editor.c:1612
 msgid " before start of appointment"
 msgstr "antes del inicio de la cita"
 
-#: calendar/gui/event-editor.c:1619
+#: calendar/gui/event-editor.c:1614
 msgid " after start of appointment"
 msgstr "tras el inicio de la cita"
 
-#: calendar/gui/event-editor.c:1627
+#: calendar/gui/event-editor.c:1622
 msgid " before end of appointment"
 msgstr "antes del fin de la cita"
 
-#: calendar/gui/event-editor.c:1629
+#: calendar/gui/event-editor.c:1624
 msgid " after end of appointment"
 msgstr "tras el fin de la cita"
 
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
+#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
 #: calendar/gui/print.c:1099 calendar/gui/print.c:1100
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
@@ -2832,7 +2855,7 @@ msgstr "siempre"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:87
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -2856,11 +2879,11 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "año(s)"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#: calendar/gui/e-week-view.c:3277 calendar/gui/e-week-view.c:3300
 msgid "New Appointment..."
 msgstr "Nueva Cita..."
 
-#: calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3313
 msgid "Delete All Occurrences"
 msgstr "Borrar todas las Ocurrencias"
 
@@ -2871,32 +2894,28 @@ msgstr "Borrar todas las Ocurrencias"
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Mostrar todo "
-
-#: calendar/gui/gnome-cal.c:237
+#: calendar/gui/gnome-cal.c:234
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: calendar/gui/gnome-cal.c:238
+#: calendar/gui/gnome-cal.c:235
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: calendar/gui/gnome-cal.c:239
+#: calendar/gui/gnome-cal.c:236
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/gnome-cal.c:240
+#: calendar/gui/gnome-cal.c:237
 msgid "Has category"
 msgstr "Tiene la categoría"
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:840
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:851
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El método necesario para abrir `%s' no esta soportado"
@@ -3173,9 +3192,8 @@ msgstr "Año actual (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1447
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -3225,26 +3243,123 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
-#: camel/camel-cipher-context.c:169
+#: calendar/pcs/query.c:218
+msgid "time-now expects 0 arguments"
+msgstr "time-now espera 0 argumentos"
+
+#: calendar/pcs/query.c:242
+msgid "make-time expects 1 argument"
+msgstr "make-time espera 1 argumento"
+
+#: calendar/pcs/query.c:247
+msgid "make-time expects argument 1 to be a string"
+msgstr "make-time espera que el argumento 1 sea una cadena"
+
+#: calendar/pcs/query.c:255
+msgid "make-time argument 1 must be an ISO 8601 date/time string"
+msgstr "el argumento 1 de make-time debe ser una cadena ISO 8601 fecha/hora"
+
+#: calendar/pcs/query.c:281
+msgid "time-add-day expects 2 arguments"
+msgstr "time-add-day espera 2 argumentos"
+
+#: calendar/pcs/query.c:286
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr "time-add-day espera que el argumento 1 sea de tipo time_t"
+
+#: calendar/pcs/query.c:293
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr "time-add-day espera que el argumento 2 sea un entero"
+
+#: calendar/pcs/query.c:318
+msgid "time-day-begin expects 1 argument"
+msgstr "time-day-begin espera 1 argumento"
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr "time-day-begin espera que el argumento 1 sea de tipo time_t"
+
+#: calendar/pcs/query.c:348
+msgid "time-day-end expects 1 argument"
+msgstr "time-day-end espera 1 argumento"
+
+#: calendar/pcs/query.c:353
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr "time-day-end espera que el argumento 1 sea de tipo time_t"
+
+#: calendar/pcs/query.c:389
+msgid "get-vtype expects 0 arguments"
+msgstr "get-vtype espera 0 argumentos"
+
+#: calendar/pcs/query.c:472
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr "occur-in-time-range? espera 2 argumentos"
+
+#: calendar/pcs/query.c:477
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr "occur-in-time-range? espera que el argumento 1 sea de tipo time_t"
+
+#: calendar/pcs/query.c:484
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr "occur-in-time-range? espera que el argumento 2 sea de tipo time_t"
+
+#: calendar/pcs/query.c:611
+msgid "contains? expects 2 arguments"
+msgstr "contains? espera 2 argumentos"
+
+#: calendar/pcs/query.c:616
+msgid "contains? expects argument 1 to be a string"
+msgstr "contains? espera que el argumento 1 sea una cadena"
+
+#: calendar/pcs/query.c:623
+msgid "contains? expects argument 2 to be a string"
+msgstr "contains? espera que el argumento 2 sea una cadena"
+
+#: calendar/pcs/query.c:640
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+"contains? espera que el argumento 1 este entre \"any\", \"summary\", "
+"\"description\""
+
+#: calendar/pcs/query.c:678
+msgid "has-categories? expects at least 1 argument"
+msgstr "has-categories? espera al menos 1 argumento"
+
+#: calendar/pcs/query.c:684
+msgid "has-categories? expects all arguments to be strings"
+msgstr "has-categories? espera que todos los argumentos sean cadenas"
+
+#: calendar/pcs/query.c:932
+msgid "Evaluation of the search expression did not yield a boolean value"
+msgstr ""
+"La evaluación de las expresiones de busqueda no devolvio un valor booleano"
+
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Firmar no esta soportado por este cifrado"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Firmado en claro no esta soportado por este cifrado"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "La verificación no esta soportada por este cifrado"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "La encriptación no está soportada por este cifrado"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "La desencriptación no está soportada por este cifrado"
 
+#: camel/camel-disco-store.c:271
+msgid "You must be working online to complete this operation"
+msgstr "Debe estar trabajando en línea para competar esta operación"
+
 #: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
@@ -3416,54 +3531,54 @@ msgstr "(Error desconocido)"
 msgid "Error copying mail temp file: %s"
 msgstr "Error copiando el correo al archivo temporal: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:190
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Por favor introduzca su frase de paso%s %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Por favor introduzca su frase de paso %s"
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:511
 msgid "No plaintext to sign."
 msgstr "No hay ningún texto plano a firmar"
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
+#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
 msgid "No password provided."
 msgstr "No se dio contraseña"
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
-#: camel/camel-pgp-context.c:1274
+#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
+#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
+#: camel/camel-pgp-context.c:1276
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "No pude comunicar con GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:683
 msgid "No plaintext to clearsign."
 msgstr "No hay ningún texto plano para firmar."
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:873
 msgid "No plaintext to verify."
 msgstr "No hay ningún texto plano a verificar."
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:890
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "No pude crear archivo temporal: %s"
 
-#: camel/camel-pgp-context.c:1045
+#: camel/camel-pgp-context.c:1047
 msgid "No plaintext to encrypt."
 msgstr "No hay ningún texto plano a encriptar."
 
-#: camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1073
 msgid "No recipients specified"
 msgstr "No ha especificado destinatarios"
 
-#: camel/camel-pgp-context.c:1259
+#: camel/camel-pgp-context.c:1261
 msgid "No ciphertext to decrypt."
 msgstr "No hay ningún texto cifrado a desencriptar."
 
@@ -3483,37 +3598,37 @@ msgstr "No puedo cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "No pude cagar %s: No hay código de inicialización en el módulo."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s servicio para %s en %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Conexión cancelada"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:269
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No pude conectar con %s (puerto %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(servidor desconocido)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
+#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
+#: camel/camel-remote-store.c:470
 #: camel/providers/imap/camel-imap-command.c:287
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:476
 msgid "Server unexpectedly disconnected"
 msgstr "El servidor se desconectó inesperadamente"
 
@@ -3624,7 +3739,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:433
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autentificación errónea desde el servidor."
 
@@ -3688,12 +3803,12 @@ msgstr "Proveedor de correo de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para leer correo como una búsqueda de otras carpetas"
 
-#: camel/camel-session.c:294 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hay proveedor para el protocolo `%s'"
 
-#: camel/camel-session.c:478
+#: camel/camel-session.c:479
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3702,6 +3817,61 @@ msgstr ""
 "No puedo crear el directorio %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:194
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Por favor introduzca su contraseña para %s"
+
+#: camel/camel-smime-context.c:210
+msgid "Error hashing password."
+msgstr "Error calculando el hash de la contraseña."
+
+#: camel/camel-smime-context.c:219
+msgid "Invalid password."
+msgstr "Contraseña erronea."
+
+#: camel/camel-smime-context.c:327
+#, c-format
+msgid "Could not sign: certificate not found for \"%s\"."
+msgstr "No pude firmar: certificado no encontrado para \"%s\"."
+
+#: camel/camel-smime-context.c:343
+msgid "Could not sign: failed to create content info."
+msgstr "No pude firmar: error al crear la información del contenido."
+
+#: camel/camel-smime-context.c:350
+msgid "Could not sign: failed to create signing context."
+msgstr "No pude firmar: error al crear el contexto a firmar."
+
+#: camel/camel-smime-context.c:356
+msgid "Could not sign: failed to create signature."
+msgstr "No pude firmar: error al crear la firma."
+
+#: camel/camel-smime-context.c:383
+msgid "'clearsign' is not supported by S/MIME."
+msgstr "'firma en claro' no está soportado por S/MIME."
+
+#: camel/camel-smime-context.c:528
+msgid "Could not encrypt: failed to create enveloped data."
+msgstr "No pude encriptar: error al crear la información del sobre."
+
+#: camel/camel-smime-context.c:535
+msgid "Could not encrypt: failed to create encryption context."
+msgstr "No pude encriptar: error al crear el contexto de encriptación."
+
+#: camel/camel-smime-context.c:570
+#, c-format
+msgid "Could not encrypt data: invalid user key: \"%s\"."
+msgstr "No pude encriptar: clave de usuario invalida: \"%s\"."
+
+#: camel/camel-smime-context.c:576
+msgid "Could not encrypt: encoding failed."
+msgstr "No pude encriptar: error en la codificación."
+
+#: camel/camel-smime-context.c:626
+msgid "Failed to decrypt: Unknown"
+msgstr "Fallo al desencriptar: Desconocido"
+
 #. Fill in the new fields
 #: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
 #: mail/mail-ops.c:1032 mail/mail-ops.c:1033
@@ -3728,7 +3898,7 @@ msgstr ""
 "País: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3743,6 +3913,15 @@ msgstr ""
 "\n"
 "¿Quieres aceptarlo de todos modos?"
 
+#: camel/camel-tcp-stream-openssl.c:423
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+"Responsable: %s\n"
+"Asunto: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -3795,31 +3974,31 @@ msgstr "La respuesta del servidor IMAP no contenía información de %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente a respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:172
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:189
+#: camel/providers/imap/camel-imap-folder.c:191
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:362
+#: camel/providers/imap/camel-imap-folder.c:364
 msgid "Scanning IMAP folder"
 msgstr "Escaneando carpeta IMAP"
 
-#: camel/providers/imap/camel-imap-folder.c:1043
-#: camel/providers/imap/camel-imap-folder.c:1265
+#: camel/providers/imap/camel-imap-folder.c:1047
+#: camel/providers/imap/camel-imap-folder.c:1281
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:1071
-#: camel/providers/imap/camel-imap-folder.c:1298
+#: camel/providers/imap/camel-imap-folder.c:1075
+#: camel/providers/imap/camel-imap-folder.c:1314
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
 msgid "Checking for new mail"
 msgstr "Comprobando si hay correo nuevo"
 
@@ -3827,7 +4006,7 @@ msgstr "Comprobando si hay correo nuevo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:551
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:598
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -3859,28 +4038,28 @@ msgstr "Para leer y guardar correo en los servidores IMAP."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Conectará con el servidor IMAP usando una contraseña de texto plano"
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:456
 #, 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:464
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:466
+#: camel/providers/smtp/camel-smtp-transport.c:366
 #, 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:488
+#: camel/providers/imap/camel-imap-store.c:490
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor escriba la contraseña IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:503
-#: camel/providers/smtp/camel-smtp-transport.c:402
+#: camel/providers/imap/camel-imap-store.c:505
+#: camel/providers/smtp/camel-smtp-transport.c:410
 msgid "You didn't enter a password."
 msgstr "No escribió una clave."
 
-#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/imap/camel-imap-store.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3891,7 +4070,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:788 mail/mail-local.c:337
+#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
@@ -4326,7 +4505,7 @@ msgstr "Dejar mensajes en el servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar tras %s día(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
@@ -4419,7 +4598,7 @@ msgid "No such folder `%s'."
 msgstr "No existe la carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:67
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4472,7 +4651,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Envío de correo vía el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4480,124 +4659,124 @@ msgstr "SMTP"
 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:168
 msgid "Syntax error, command unrecognized"
 msgstr "Error de sintaxis, comando no reconocido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error in parameters or arguments"
 msgstr "Error de sintaxis en los parámetros o los argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Command not implemented"
 msgstr "Comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command parameter not implemented"
 msgstr "Parámetro del comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "System status, or system help reply"
 msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Help message"
 msgstr "Mensaje de ayuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service closing transmission channel"
 msgstr "Servicio cerrando los canales de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio no disponible, cerrando los canales de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Requested mail action okay, completed"
 msgstr "Acción de correo requerida en orden, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "User not local; will forward to <forward-path>"
 msgstr "El usuario no es local: lo reenviaré a <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Acción solicitada del correo no realizada: el mailbox no está disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Acción solicitada no realizada: el mailbox no está disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action aborted: error in processing"
 msgstr "Acción solicitada abortada: error en procesamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "User not local; please try <forward-path>"
 msgstr "El usuario no es local: por favor pruebe con <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Acción solicitada no realizada: la capacidad del sistema es insuficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Acción solicitada no realizada: excedió la capacidad de almacenamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Acción solicitada no realizada: nombre no permitido para mailbox"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Transaction failed"
 msgstr "Fallo en la transacción"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "A password transition is needed"
 msgstr "Es necesaria una transición de contraseña"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Authentication mechanism is too weak"
 msgstr "El método de autenticación en demasiado debil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Encriptación requerida por el mecanismo de autenticación pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal en la autenticación"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication required"
 msgstr "Autenticación requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:313
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Mensaje de bienvenida erróneo: %s: posiblemente no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "El servidor SMTP %s no soporta el método de autenticación requerido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/smtp/camel-smtp-transport.c:395
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPor favor escriba la contraseña SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/smtp/camel-smtp-transport.c:418
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4608,112 +4787,116 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:526
+#: camel/providers/smtp/camel-smtp-transport.c:534
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Envío de correo SMTP vía %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:553
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not defined."
 msgstr "No puedo enviar el mensaje: dirección del remitente no definida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:568
 msgid "Cannot send message: sender address not valid."
 msgstr "No puedo enviar el mensaje: dirección del remitente no válida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:574
+#: camel/providers/smtp/camel-smtp-transport.c:582
 msgid "Cannot send message: no recipients defined."
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:676
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Expiró el tiempo para HELO: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:687
+#: camel/providers/smtp/camel-smtp-transport.c:695
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Respuesta de error al HELO: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:720
+#: camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticación SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:735
-#: camel/providers/smtp/camel-smtp-transport.c:747
+#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:755
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Expiró el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:797
+#: camel/providers/smtp/camel-smtp-transport.c:764
+msgid "AUTH request failed."
+msgstr "Error en la petición de AUTH."
+
+#: camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Bad authentication response from server.\n"
 msgstr "Respuesta de autenticación errónea desde el servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:823
+#: camel/providers/smtp/camel-smtp-transport.c:835
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:842
+#: camel/providers/smtp/camel-smtp-transport.c:854
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:867
+#: camel/providers/smtp/camel-smtp-transport.c:879
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:886
+#: camel/providers/smtp/camel-smtp-transport.c:898
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Respuesta de error a RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:929
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para DATA: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:936
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Respuesta de error a DATA: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
-#: camel/providers/smtp/camel-smtp-transport.c:969
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:981
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Expiró el tiempo para el envío de DATA: terminación del mensaje: %s: correo "
 "no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:988
+#: camel/providers/smtp/camel-smtp-transport.c:1000
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Respuesta de error a DATA: terminación del mensaje: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1012
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Expiró el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1054
+#: camel/providers/smtp/camel-smtp-transport.c:1066
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Expiró el tiempo para QUIT: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1073
+#: camel/providers/smtp/camel-smtp-transport.c:1085
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Respuesta de error a QUIT: %s: no es fatal"
@@ -4743,7 +4926,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:122
 msgid "attachment"
 msgstr "adjunto"
 
@@ -4764,7 +4947,8 @@ msgstr "Incluir adjunto..."
 msgid "Attach a file to the message"
 msgstr "Adjuntar un fichero al mensaje"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1083
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
+#: mail/message-list.c:1081
 msgid "Attachment"
 msgstr "Adjunto"
 
@@ -4788,7 +4972,28 @@ msgstr "Tipo MIME:"
 msgid "Send as:"
 msgstr "Enviar como:"
 
-#: composer/e-msg-composer.c:529
+#: composer/e-msg-composer.c:546
+#, c-format
+msgid ""
+"This version of Evolution was not built with support for S/MIME.\n"
+"You may wish to instead use PGP to %s your document."
+msgstr ""
+"Esta versión de Evolution no fue construida con soporte para S/MIME.\n"
+"En su lugar puede querer usar PGP para %s su documento."
+
+#: composer/e-msg-composer.c:548
+msgid "sign and encrypt"
+msgstr "firmar y encriptar"
+
+#: composer/e-msg-composer.c:549
+msgid "sign"
+msgstr "firmar"
+
+#: composer/e-msg-composer.c:549
+msgid "encrypt"
+msgstr "encriptar"
+
+#: composer/e-msg-composer.c:601
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4797,21 +5002,21 @@ msgstr ""
 "No pude abrir el archivo de firma %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:702
+#: composer/e-msg-composer.c:774
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:713
+#: composer/e-msg-composer.c:785
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:733
+#: composer/e-msg-composer.c:805
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:877
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4819,12 +5024,12 @@ msgstr ""
 "No pude abrir la carpeta de borradores para esta cuenta.\n"
 "¿Quiere usar la carpeta de borradores por defecto?"
 
-#: composer/e-msg-composer.c:863 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
+#: composer/e-msg-composer.c:935 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:228
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:869
+#: composer/e-msg-composer.c:941
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4834,27 +5039,27 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:894
+#: composer/e-msg-composer.c:966
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1020
+#: composer/e-msg-composer.c:1092
 msgid "That file does not exist."
 msgstr "Ese archivo no existe."
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1102
 msgid "That is not a regular file."
 msgstr "Ese no es un archivo normal."
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1112
 msgid "That file exists but is not readable."
 msgstr "Ese archivo no es legible."
 
-#: composer/e-msg-composer.c:1050
+#: composer/e-msg-composer.c:1122
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Ese archivo parece accesible pero open(2) ha fallado."
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1144
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4862,64 +5067,64 @@ msgstr ""
 "El archivo es muy largo (más de 100K).\n"
 "¿Esta seguro que quiere añadirlo?"
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1165
 msgid "An error occurred while reading the file."
 msgstr "Ha ocurrido un error mientras se leía el archivo."
 
-#: composer/e-msg-composer.c:1394 composer/e-msg-composer.c:1737
+#: composer/e-msg-composer.c:1526 composer/e-msg-composer.c:1871
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:1828
+#: composer/e-msg-composer.c:1962
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:324
 msgid "Click here for the address book"
 msgstr "Presione aquí para acceder a la agenda"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:355
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:361
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:372
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:386
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:395
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5049,6 +5254,10 @@ msgstr ""
 msgid "File does not have a place for the services.\n"
 msgstr "El archivo no tiene un lugar para el servicio.\n"
 
+#: executive-summary/component/e-summary-callbacks.c:126
+msgid "Select a service"
+msgstr "Seleccione un servicio"
+
 #: executive-summary/component/e-summary-callbacks.c:290
 msgid ""
 "You can select a different HTML page for the background of the Executive "
@@ -5174,19 +5383,19 @@ msgstr "Probar Servicio"
 msgid "Error"
 msgstr "Error"
 
-#: executive-summary/test-service/rdf-summary.c:768
+#: executive-summary/test-service/rdf-summary.c:775
 msgid "Update automatically"
 msgstr "Actualizado automático"
 
-#: executive-summary/test-service/rdf-summary.c:778
+#: executive-summary/test-service/rdf-summary.c:785
 msgid "Update now"
 msgstr "Actualizar ahora"
 
-#: executive-summary/test-service/rdf-summary.c:788
+#: executive-summary/test-service/rdf-summary.c:795
 msgid "Update every "
 msgstr "Actualizar cada "
 
-#: executive-summary/test-service/rdf-summary.c:796
+#: executive-summary/test-service/rdf-summary.c:806
 #: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minutos"
@@ -5573,7 +5782,7 @@ msgid "Replied to"
 msgstr "Respondido a"
 
 #: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1083
+#: mail/message-list.c:1081
 msgid "Score"
 msgstr "Puntuación"
 
@@ -5605,7 +5814,7 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1084
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:767 mail/message-list.c:1082
 msgid "Subject"
 msgstr "Asunto"
 
@@ -5633,101 +5842,173 @@ msgstr "Editar Regla"
 msgid "Score Rules"
 msgstr "Reglas de puntuación"
 
-#: mail/component-factory.c:329
+#: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
+#: importers/netscape-importer.c:780 importers/pine-importer.c:646
+#: shell/e-shell-importer.c:653 shell/importer/import.glade.h:4
+msgid "Import"
+msgstr "Importar"
+
+#: importers/elm-importer.c:517 importers/netscape-importer.c:785
+#: importers/pine-importer.c:651
+msgid "Mail"
+msgstr "Correo"
+
+#: importers/elm-importer.c:521
+msgid "Elm Aliases"
+msgstr "Alias de Elm"
+
+#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
+#: importers/netscape-importer.c:807 importers/pine-importer.c:668
+msgid "Don't ask me again"
+msgstr "No me preguntes más veces"
+
+#: importers/elm-importer.c:561
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution ha encontrado archivos de correo de Elm\n"
+"¿Quiere importarlos a Evolution?"
+
+#: importers/elm-importer.c:579
+msgid "Elm mail"
+msgstr "Correo de Elm"
+
+#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+msgid "Addressbook"
+msgstr "Agenda de direcciones"
+
+#: importers/evolution-gnomecard-importer.c:275
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution ha encontrado archivos de GnomeCard.\n"
+"¿Quiere importarlos a Evolution?"
+
+#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+msgid "Settings"
+msgstr "Configuración"
+
+#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1359
+msgid "Filters"
+msgstr "Filtros"
+
+#: importers/netscape-importer.c:800
+msgid "Addressbooks"
+msgstr "Agenda de direcciones"
+
+#: importers/netscape-importer.c:847
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution ha encontrado archivos de correo de Netscape.\n"
+"¿Quiere importarlos a Evolution?"
+
+#: importers/pine-importer.c:705
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution ha encontrado archivos de correo de Pine.\n"
+"¿Quiere importarlos a Evolution?"
+
+#: importers/pine-importer.c:723
+msgid "Pine mail"
+msgstr "Correo de Pine"
+
+#: mail/component-factory.c:337
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:410
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser.c:267
+#: mail/folder-browser.c:329
 msgid "Store search as vFolder"
 msgstr "Guardar la búsqueda como una carpeta virtual"
 
-#: mail/folder-browser.c:575 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:653
 msgid "VFolder on _Subject"
 msgstr "VFolder según el a_sunto"
 
-#: mail/folder-browser.c:578 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:656
 msgid "VFolder on Se_nder"
 msgstr "VFolder según el _remitente"
 
-#: mail/folder-browser.c:581 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:659
 msgid "VFolder on _Recipients"
 msgstr "VFolder según los _destinatarios"
 
-#: mail/folder-browser.c:584 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:662
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual según la _Lista de Correo"
 
-#: mail/folder-browser.c:590
+#: mail/folder-browser.c:668
 msgid "Filter on Sub_ject"
 msgstr "Filtrar según el As_unto"
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:671
 msgid "Filter on Sen_der"
 msgstr "Filtrar según el Re_mitente"
 
-#: mail/folder-browser.c:596
+#: mail/folder-browser.c:674
 msgid "Filter on Re_cipients"
 msgstr "Filtrar según los Des_tinatarios"
 
-#: mail/folder-browser.c:599
+#: mail/folder-browser.c:677
 msgid "Filter on _Mailing List"
 msgstr "Filtrar según la Lista de _Correo"
 
-#: mail/folder-browser.c:608
+#: mail/folder-browser.c:686
 msgid "_Open"
 msgstr "_Abrir"
 
-#: mail/folder-browser.c:610
+#: mail/folder-browser.c:688
 msgid "Resend"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:612 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:690 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:118 ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: mail/folder-browser.c:614 ui/evolution-event-editor.xml.h:69
+#: mail/folder-browser.c:692 ui/evolution-event-editor.xml.h:69
 #: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:619
+#: mail/folder-browser.c:697 ui/evolution-mail.xml.h:117
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:699 ui/evolution-mail.xml.h:72
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:701
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:625
-msgid "Forward _inline"
-msgstr "Reenviar _dentro del mensaje"
-
-#: mail/folder-browser.c:628 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:704
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: mail/folder-browser.c:630 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:706
 msgid "Mark as U_nread"
 msgstr "Marcar como _no leído"
 
-#: mail/folder-browser.c:635 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:711
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:713
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:641 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:717 ui/evolution-mail.xml.h:121
 msgid "_Undelete"
 msgstr "_Recuperar"
 
@@ -5735,38 +6016,38 @@ msgstr "_Recuperar"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:651 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:727
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:655
+#: mail/folder-browser.c:731
 msgid "Create Ru_le From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:870
 msgid "Filter on Mailing List"
 msgstr "Filtrar según la lista de correo"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:871
 msgid "VFolder on Mailing List"
 msgstr "Carpeta virtual según la Lista de Correo"
 
-#: mail/folder-browser.c:797
+#: mail/folder-browser.c:873
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar según la lista de correo (%s)"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:874
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Carpeta virtual según la Lista de Correo (%s)"
 
-#: mail/folder-browser-factory.c:213
+#: mail/folder-browser-factory.c:196
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para \"%s\""
 
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:198 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Propiedades"
@@ -5803,17 +6084,9 @@ msgstr "Factoría para el componente de correo de Evolution."
 msgid "Factory for the Mail Summary component."
 msgstr "Factoría para el componente de Resumen de Correo."
 
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution ha encontrado archivos de correo de Elm.\n"
-"¿Quiere importarlos a Evolution?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Correo de Elm"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "Interface de configuración del correo"
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
@@ -5831,26 +6104,6 @@ msgstr "Factoría para importar mensajes de Outlook Express 4 a Evolution."
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importa archivos de Outlook Express 4 a Evolution."
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution ha encontrado archivos de correo de Netscape.\n"
-"¿Quiere importarlos a Evolution?"
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution ha encontrado archivos de correo de Pine.\n"
-"¿Quiere importarlos a Evolution?"
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Correo de Pine"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Formato de almacenamiento actual:"
@@ -5903,7 +6156,7 @@ msgstr "(valores predeterminados)"
 msgid "Disable"
 msgstr "Deshabilitado"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
 msgid "Enable"
 msgstr "Habilitado"
 
@@ -5916,7 +6169,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "¿Esta seguro que quiere borrar esta cuenta de noticias?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#: mail/mail-accounts.c:568
 msgid "Evolution Account Manager"
 msgstr "Administrador de cuentas de Evolution"
 
@@ -5944,7 +6197,7 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Añadir Regla de Filtro"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5956,7 +6209,7 @@ msgstr ""
 "recibir o escribir mensajes.\n"
 "¿Querría configurarlo ahora?"
 
-#: mail/mail-callbacks.c:149
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5964,7 +6217,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:161
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5972,11 +6225,11 @@ msgstr ""
 "Necesita configurar un transporte de\n"
 "correo para poder enviarlo."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr "No has definido un sistema para enviar el correo"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5984,37 +6237,37 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "¿Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:308
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:351
 msgid "You must configure an account before you can send this email."
 msgstr "Debe configurar una cuenta antes de poder enviar este mensaje."
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:594
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "El día %s, %s escribió:"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:756
 msgid "Forwarded message:\n"
 msgstr "Mensaje reenviado:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:850
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:852
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1017
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "¿Esta seguro que quiere editar los %d mensajes?"
 
-#: mail/mail-callbacks.c:1170
+#: mail/mail-callbacks.c:1039
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6022,7 +6275,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1073
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6030,15 +6283,20 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1085
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "¿Esta seguro que quiere reenviar los %d mensajes?"
+
+#: mail/mail-callbacks.c:1106
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1140 mail/mail-display.c:92
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
+#: mail/mail-callbacks.c:1144 mail/mail-display.c:96
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -6046,15 +6304,15 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Sobreescribirlo?"
 
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1188
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1190
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1349
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6063,20 +6321,20 @@ msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1407
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1454
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresión del mensaje"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1549
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "¿Esta seguro que quiere abrir %d mensajes en ventanas separadas?"
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
+#: mail/mail-config.c:1213 mail/mail-config.c:1216
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -6154,18 +6412,26 @@ msgid "Accounts"
 msgstr "Cuentas"
 
 #: mail/mail-config.glade.h:8
+msgid "Always load images off the net"
+msgstr "Cargar imagenes fuera de la red"
+
+#: mail/mail-config.glade.h:10
 msgid "Authentication"
 msgstr "Autentificación"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Authentication Type: "
 msgstr "Tipo de autentificación: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Automatically check for new mail every"
 msgstr "Comprobar el correo automáticamente cada"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
+msgid "Composer"
+msgstr "Nuevo"
+
+#: mail/mail-config.glade.h:15
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6181,163 +6447,191 @@ msgstr ""
 "\n"
 "Pulse \"Finalizar\" para guardar su configuración."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:21
 msgid "De_fault"
 msgstr "Va_lores predeterminados"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
+msgid "Default \"Forward\" style is: "
+msgstr "El estilo por defecto de \"Reenviar\" es: "
+
+#: mail/mail-config.glade.h:25
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:26
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:27
 msgid "Drafts folder:"
 msgstr "Carpeta de borradores:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:29
 msgid "Email Address:"
 msgstr "Dirección de correo:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:31
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
-msgstr "Citas resaltadas con "
+#: mail/mail-config.glade.h:32
+msgid "Highlight citations with"
+msgstr "Resaltadar citas con"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:34
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:35
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:36
+msgid "In HTML mail"
+msgstr "Correo en HTML"
+
+#: mail/mail-config.glade.h:37
+msgid "Inline"
+msgstr "Incluido en línea"
+
+#: mail/mail-config.glade.h:38
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:39
+msgid "Load images if sender is in addressbook"
+msgstr "Cargar imágenes si el remitente esta el la agenda de direcciones"
+
+#: mail/mail-config.glade.h:40
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:41
 msgid "Make this my default account"
 msgstr "Hacer de esta mi cuenta predeterminada"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:42
 msgid "Mark messages as \"Read\" after:"
 msgstr "Marcar mensajes como \"Leídos\" tras:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:44
+msgid "Never load images off the net"
+msgstr "No cargar nunca imágenes desde la red"
+
+#: mail/mail-config.glade.h:45
 msgid "News"
 msgstr "Noticias"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "Optional Information"
 msgstr "Información Opcional"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:48
 msgid "Organization:"
 msgstr "Organización:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:49
+msgid "PGP"
+msgstr "PGP"
+
+#: mail/mail-config.glade.h:50
 msgid "PGP binary path:"
 msgstr "Localización del binario de PGP:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:55
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:56
+msgid "Quoted"
+msgstr "Citado"
+
+#: mail/mail-config.glade.h:57
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:58
 msgid "Receiving Mail"
 msgstr "Recibiendo Mensajes"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:59
 msgid "Receiving Options"
 msgstr "Recibiendo Opciones"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:61
 msgid "Required Information"
 msgstr "Información Requerida"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:63
 msgid "Select PGP binary"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:64
 msgid "Send mail in HTML format by default."
 msgstr "Enviar por defecto el mensaje en formato HTML"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:65
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:66
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:68
 msgid "Sent"
 msgstr "Enviado"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:69
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:70
 msgid "Sent messages folder:"
 msgstr "Carpeta de mensajes enviados:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:71
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:72
 msgid "Server Type: "
 msgstr "Tipo de servidor:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:73
 msgid "Server requires authentication"
 msgstr "El servidor requiere autentificación"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:74
 msgid "Signature file:"
 msgstr "Archivo de firma:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:75
 msgid "Sources"
 msgstr "Fuentes"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:76
 msgid "Special Folders"
 msgstr "Carpetas Especiales"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:77
 msgid "Standard Unix mbox"
 msgstr "Mabox estándar de Unix"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:78
 msgid "Type"
 msgstr "Tipo"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
 msgid "Use secure connection (SSL)"
 msgstr "Use conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:80
 msgid "Username:"
 msgstr "Nombre:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:81
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6347,159 +6641,211 @@ msgstr ""
 "\n"
 "Pulse \"Siguiente\" para comenzar. "
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
+#: mail/mail-config.glade.h:86 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:45 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:48
 msgid "_Edit"
 msgstr "_Editar"
 
-#: mail/mail-display.c:194
+#: mail/mail-crypto.c:59
+msgid "Could not create a PGP signature context."
+msgstr "No pude crear un contexto de firma PGP."
+
+#: mail/mail-crypto.c:84
+msgid "Could not create a PGP verification context."
+msgstr "No pude crear un contexto de verificación PGP."
+
+#: mail/mail-crypto.c:113
+msgid "Could not create a PGP encryption context."
+msgstr "No pude crear un contexto de encriptación PGP."
+
+#: mail/mail-crypto.c:138
+msgid "Could not create a PGP decryption context."
+msgstr "No pude crear un contexto de desencriptación PGP."
+
+#: mail/mail-crypto.c:169
+msgid "Could not create a S/MIME signature context."
+msgstr "No pude crear un contexto de firma S/MIME."
+
+#: mail/mail-crypto.c:195
+msgid "Could not create a S/MIME verification context."
+msgstr "No pude crear un contexto de verificación S/MIME."
+
+#: mail/mail-crypto.c:225
+msgid "Could not create a S/MIME encryption context."
+msgstr "No pude crear un contexto de encriptación S/MIME."
+
+#: mail/mail-crypto.c:251
+msgid "Could not create a S/MIME decryption context."
+msgstr "No pude crear un contexto de desencriptación S/MIME."
+
+#: mail/mail-display.c:196
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:236
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/mail-display.c:295
+#: mail/mail-display.c:297
 msgid "Save to Disk..."
 msgstr "Guardar en disco..."
 
-#: mail/mail-display.c:297
+#: mail/mail-display.c:299
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:301
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:336
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:359
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (vía %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:363
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:962
+msgid "Loading message content"
+msgstr "Cargando el contenido del mensaje"
+
+#: mail/mail-display.c:1256
 msgid "Open link in browser"
 msgstr "Abrir enlaze en el navegador"
 
-#: mail/mail-display.c:1109
+#: mail/mail-display.c:1258
 msgid "Save as (FIXME)"
 msgstr "Guardar como (ARREGLAME)"
 
-#: mail/mail-display.c:1111
+#: mail/mail-display.c:1260
 msgid "Copy location (FIXME)"
 msgstr "Copiar dirección (ARREGLAME)"
 
-#: mail/mail-format.c:522
+#: mail/mail-format.c:527
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:573
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "Cargando el contenido del mensaje"
+#: mail/mail-format.c:640 mail/message-list.c:1082
+msgid "Date"
+msgstr "Fecha"
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:756 mail/message-list.c:1082
+msgid "From"
+msgstr "De"
+
+#: mail/mail-format.c:759
+msgid "Reply-To"
+msgstr "Responder a"
+
+#: mail/mail-format.c:762 mail/message-list.c:1083
+msgid "To"
+msgstr "A"
+
+#: mail/mail-format.c:765
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/mail-format.c:1075
 msgid "No GPG/PGP program configured."
 msgstr "No hay programas GPG/PGP configurados."
 
-#: mail/mail-format.c:1095
+#: mail/mail-format.c:1090
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:1101
+#: mail/mail-format.c:1096
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:1102
+#: mail/mail-format.c:1097
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1192 mail/mail-format.c:1580
+#: mail/mail-format.c:1153
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Este mensaje está firmado digitalmente y es auténtico."
 
-#: mail/mail-format.c:1200 mail/mail-format.c:1588
+#: mail/mail-format.c:1161
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Este mensaje está firmado digitalmente pero no se puede verificar su "
 "autenticidad."
 
-#: mail/mail-format.c:1801
+#: mail/mail-format.c:1787
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) valido en \"%s\""
 
-#: mail/mail-format.c:1817
+#: mail/mail-format.c:1803
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:1851
+#: mail/mail-format.c:1837
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1856
+#: mail/mail-format.c:1842
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:505
 #, c-format
 msgid "Opening '%s'"
 msgstr "Abriendo '%s'"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:785
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta \"%s\" al formato \"%s\""
 
-#: mail/mail-local.c:791
+#: mail/mail-local.c:789
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar la carpeta \"%s\" al formato \"%s\""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:812
 msgid "Reconfiguring folder"
 msgstr "Reconfigurar carpeta"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:841
 msgid "Closing current folder"
 msgstr "Cerrando carpeta actual"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:873
 msgid "Renaming old folder and opening"
 msgstr "Renombrando carpeta antigua y abriéndola"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:891
 msgid "Creating new folder"
 msgstr "Creando una nueva carpeta"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:905
 msgid "Copying messages"
 msgstr "Copiando mensajes"
 
-#: mail/mail-local.c:924
+#: mail/mail-local.c:922
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6508,7 +6854,7 @@ msgstr ""
 "No puedo guardar la metainformación de la carpeta: probablemente\n"
 "volver a abrir esta carpeta: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:961
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6669,13 +7015,42 @@ msgstr ""
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
+#: mail/mail-ops.c:1939
+#, c-format
+msgid "Disconnecting from %s"
+msgstr "Desconectar de %s"
+
+#: mail/mail-search.c:138
+msgid "(Untitled Message)"
+msgstr "(Mansaje sin título)"
+
+#: mail/mail-search.c:268
+msgid "Find in Message"
+msgstr "Buscar en Mensaje"
+
+#: mail/mail-search.c:298
+msgid "Case Sensitive"
+msgstr "Sensible a mayusculas"
+
+#: mail/mail-search.c:299
+msgid "Search Forward"
+msgstr "Buscar hacia adelante"
+
+#: mail/mail-search.c:316
+msgid "Find:"
+msgstr "Buscar:"
+
+#: mail/mail-search.c:319
+msgid "Matches:"
+msgstr "Coincide:"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Buscar"
 
 #: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
-msgstr "Cancelando ..."
+msgid "Cancelling..."
+msgstr "Cancelando..."
 
 #: mail/mail-send-recv.c:233
 msgid "Send & Receive mail"
@@ -6686,11 +7061,11 @@ msgid "Receiving"
 msgstr "Recibiendo"
 
 #: mail/mail-send-recv.c:285
-msgid "Updating ..."
+msgid "Updating..."
 msgstr "Actualizando..."
 
 #: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+msgid "Waiting..."
 msgstr "Esperando..."
 
 #: mail/mail-send-recv.c:306
@@ -6709,30 +7084,30 @@ msgstr "¡Mensaje escrito incompleto en la tubería!"
 msgid "Mail Summary"
 msgstr "Resumen de Correo"
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:145
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No puedo crear el mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:188
+#: mail/mail-tools.c:192
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaje reenviado)"
 
-#: mail/mail-tools.c:198
+#: mail/mail-tools.c:202
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sin asunto)"
 
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:219
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:217
+#: mail/mail-tools.c:221
 msgid "Forwarded message (no subject)"
 msgstr "Mensaje reenviado (sin asunto)"
 
-#: mail/mail-tools.c:415
+#: mail/mail-tools.c:428
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
@@ -6745,144 +7120,132 @@ msgstr ""
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:438
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
+#: mail/message-browser.c:188 ui/evolution-mail.xml.h:70
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
+#: mail/message-browser.c:188
 msgid "Reply to the sender of this message"
 msgstr "Responder al remitente de este mensaje"
 
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
+#: mail/message-browser.c:191 ui/evolution-mail.xml.h:71
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
+#: mail/message-browser.c:191
 msgid "Reply to all recipients of this message"
 msgstr "Responder a todos los destinatarios de este mensaje"
 
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
+#: mail/message-browser.c:194 ui/evolution-mail.xml.h:33
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
+#: mail/message-browser.c:194
 msgid "Forward this message"
 msgstr "Reenviar este mensaje"
 
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
+#: mail/message-browser.c:199
 msgid "Print the selected message"
 msgstr "Imprimir el mensaje seleccionado"
 
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
+#: mail/message-browser.c:202
 msgid "Delete this message"
 msgstr "Borrar este mensaje"
 
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
+#: mail/message-browser.c:207 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-mail.xml.h:64 ui/evolution-task-editor-dialog.xml.h:36
 msgid "Previous"
 msgstr "Previo"
 
-#: mail/message-browser.c:208
+#: mail/message-browser.c:207
 msgid "Previous message"
 msgstr "Mensaje previo"
 
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
+#: mail/message-browser.c:210 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:57
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Siguiente"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:210
 msgid "Next message"
 msgstr "Mensaje siguiente"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:677
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:678
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:679
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:680
 msgid "Multiple Unseen Messages"
 msgstr "Multiples mensajes sin leer"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:681
 msgid "Multiple Messages"
 msgstr "Multiples mensajes"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:685
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:688
+#: mail/message-list.c:686
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:690
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:693
+#: mail/message-list.c:691
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:943
+#: mail/message-list.c:941
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:948
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:957
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:971
+#: mail/message-list.c:969
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:979
+#: mail/message-list.c:977
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:979
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1081
 msgid "Flagged"
 msgstr "Marcado"
 
-#: mail/message-list.c:1084
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1084
-msgid "Date"
-msgstr "Fecha"
-
-#: mail/message-list.c:1084
+#: mail/message-list.c:1082
 msgid "Received"
 msgstr "Recibido"
 
-#: mail/message-list.c:1085
-msgid "To"
-msgstr "A"
-
-#: mail/message-list.c:1085
+#: mail/message-list.c:1083
 msgid "Size"
 msgstr "Tamaño"
 
@@ -6890,7 +7253,7 @@ msgstr "Tamaño"
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:48
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -7000,12 +7363,12 @@ msgstr ""
 "de Evolution. Por favor, renombre lo para permitir la\n"
 "instalación de los archivos de usuario de Evolution."
 
-#: shell/e-shell.c:388
+#: shell/e-shell.c:392
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1273
+#: shell/e-shell.c:1272
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7014,6 +7377,24 @@ msgstr ""
 "Ooops!  La vista `%s' ha cesado inesperadamente. :-(\n"
 "Esto probablemente significa que el componente %s se ha roto."
 
+#: shell/e-shell-folder-commands.c:238
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr "Especificar una carpeta en la que copiar la carpeta \"%s\":"
+
+#: shell/e-shell-folder-commands.c:243
+msgid "Copy folder"
+msgstr "Copiar una carpeta"
+
+#: shell/e-shell-folder-commands.c:280
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr "Especificar una carpeta a la que mover la carpeta \"%s\":"
+
+#: shell/e-shell-folder-commands.c:285
+msgid "Move folder"
+msgstr "Mover una carpeta"
+
 #: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
@@ -7039,7 +7420,7 @@ msgstr ""
 "El tipo de carpeta seleccionada no es valido para\n"
 "la operación requerida."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:328
 msgid "New..."
 msgstr "Nuevo..."
 
@@ -7047,33 +7428,149 @@ msgstr "Nuevo..."
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Eliga el archivo que quiere importar a Evolution, y seleccione de la lista "
+"el tipo de archivo que es.\n"
+"\n"
+"Si no lo sabe, puede elegir \"Automático\" y Evolution tratará de encargarse."
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importando %s\n"
+"El importador no esta listo.\n"
+"Esperando 5 segundos antes de reintentar."
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importando %s\n"
+"Importando elemento %d."
+
+#: shell/e-shell-importer.c:353
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"No hay ninguna herramienta para importar datos que pueda encargarse de\n"
+"%s"
+
+#: shell/e-shell-importer.c:363
+msgid "Importing"
+msgstr "Importando"
+
+#: shell/e-shell-importer.c:371
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importando %s.\n"
+"Comenzando %s"
+
+#: shell/e-shell-importer.c:384
+#, c-format
+msgid "Error starting %s"
+msgstr "Error cargando %s"
+
+#: shell/e-shell-importer.c:404
+#, c-format
+msgid "Error loading %s"
+msgstr "Error cargando %s"
+
+#: shell/e-shell-importer.c:419
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importando %s\n"
+"Importando elemento 1."
+
+#: shell/e-shell-importer.c:490
+msgid "Automatic"
+msgstr "Automático"
+
+#: shell/e-shell-importer.c:540
+msgid "Filename:"
+msgstr "Nombre de fichero:"
+
+#: shell/e-shell-importer.c:545 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Elega un archivo"
+
+#: shell/e-shell-importer.c:555
+msgid "File type:"
+msgstr "Tipo de archivo:"
+
+#: shell/e-shell-importer.c:601
+msgid "Select folder"
+msgstr "Seleccionar carpeta"
+
+#: shell/e-shell-importer.c:602
+msgid "Select a destination folder for importing this data"
+msgstr "Seleccionar una carpeta de destino donde importar estos datos"
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr "Cerrando conexiones..."
+
+#: shell/e-shell-view.c:166
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrándose)"
 
-#: shell/e-shell-view.c:1203
+#: shell/e-shell-view.c:1317
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-view.c:1319
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view.c:1357
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution está conectado.  Pulse este botón para trabajar desconectado."
+
+#: shell/e-shell-view.c:1364
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution está en proceso de desconectarse."
+
+#: shell/e-shell-view.c:1370
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution está desconectado.  Pulse este botón para trabajar conectado."
+
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:185
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:230
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:232
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7083,15 +7580,19 @@ msgstr ""
 "trabajo en grupo para manejar el correo, el calendario y\n"
 "la lista de contactos en el entorno del escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:421
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:562
+#: shell/e-shell-view-menu.c:422
+msgid "Select the folder that you want to open"
+msgstr "Seleccione la carpeta que quiere abrir"
+
+#: shell/e-shell-view-menu.c:602
 msgid "Work online"
 msgstr "Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
+#: shell/e-shell-view-menu.c:614 shell/e-shell-view-menu.c:626
 msgid "Work offline"
 msgstr "Trabajar desconectado"
 
@@ -7220,16 +7721,6 @@ msgstr "Operación no soportada"
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no esta soportado por este manejador"
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Vista"
-
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Ver la carpeta seleccionada"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nombre de la carpeta:"
@@ -7246,102 +7737,6 @@ msgstr "Especifique donde crear la carpeta:"
 msgid "The Evolution shell."
 msgstr "La shell de Evolution."
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Eliga el archivo que quiere importar a Evolution, y seleccione de la lista "
-"el tipo de archivo que es.\n"
-"\n"
-"Si no lo sabe, puede elegir \"Automático\" y Evolution tratará de encargarse."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importando %s\n"
-"El importador no esta listo.\n"
-"Esperando 5 segundos antes de reintentar."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importando %s\n"
-"Importando elemento %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"No hay ninguna herramienta para importar datos que pueda encargarse de\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importando"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importando %s.\n"
-"Comenzando %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Error cargando %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Error cargando %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importando %s\n"
-"Importando elemento 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Automático"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Nombre de fichero:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Elega un archivo"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Tipo de archivo:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importar"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Pulse \"Importar\" para comenzar a importar el archivo en Evolution. "
@@ -7364,9 +7759,9 @@ msgstr ""
 "Con este asistente será guiado a traves del proceso de\n"
 "importar archivos externos a Evolution."
 
-#: shell/importer/intelligent.c:143
-msgid "Don't ask me again"
-msgstr "No me preguntes más veces"
+#: shell/importer/intelligent.c:186
+msgid "Importers"
+msgstr "Importadores"
 
 #: shell/main.c:82
 #, no-c-format
@@ -7450,7 +7845,7 @@ msgstr "Buscar un contacto"
 msgid "New contact"
 msgstr "Nuevo contacto"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:63
 msgid "Previews the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
@@ -7458,7 +7853,7 @@ msgstr "Ver el mensaje que va a ser impreso"
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:12
 msgid "Stop"
 msgstr "Parar"
 
@@ -7492,8 +7887,8 @@ msgid "_Search for contacts"
 msgstr "Bu_scar contactos"
 
 #: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution.xml.h:64
 msgid "_Tools"
 msgstr "_Herramientas"
 
@@ -7577,7 +7972,7 @@ msgstr "Imprimir calendario"
 msgid "Print this Calendar"
 msgstr "Imprimir este calendario"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:18
 msgid "Save As"
 msgstr "Guardar como"
 
@@ -7627,7 +8022,7 @@ msgid "_Month"
 msgstr "_Mes"
 
 #: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:58
 msgid "_New"
 msgstr "_Nuevo"
 
@@ -7661,12 +8056,12 @@ msgid "Print this item"
 msgstr "Imprimir este elemento"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Imprimir..."
 
 #: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:19
 #: ui/evolution-task-editor-dialog.xml.h:51
 msgid "Save _As..."
 msgstr "Guardar _como..."
@@ -7694,13 +8089,13 @@ msgid "Send _message to contact..."
 msgstr "Enviar un _mensaje al contacto..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:46 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:49
 msgid "_File"
 msgstr "_Archivo"
 
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:53
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Guardar"
@@ -7749,7 +8144,7 @@ msgstr "Cerrar esta cita"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Cop_y to Folder... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:8
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Copiar"
@@ -7834,8 +8229,8 @@ msgstr "Configurar impr_esión..."
 msgid "Print Setup"
 msgstr "Configurar impresión"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:17
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
 msgid "Save"
 msgstr "Guardar"
 
@@ -7843,7 +8238,7 @@ msgstr "Guardar"
 msgid "Save the appointment and close the dialog box"
 msgstr "Guardar la cita y cerrar la ventana de diálogo"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:23
 #: ui/evolution-task-editor-dialog.xml.h:53
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
@@ -7856,8 +8251,7 @@ msgstr "Concertar un _encuentro"
 msgid "Schedule some sort of a meeting"
 msgstr "Programas algún tipo de encuentro"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "Seleccionar todo"
 
@@ -7873,18 +8267,17 @@ msgstr "Configurar los datos de la página para la impresora actual"
 msgid "Task _Request (FIXME)"
 msgstr "Task _Request (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "_Acerca de..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:43
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Cerrar"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:44
 msgid "_Contact (FIXME)"
 msgstr "_Contact (FIXME)"
 
@@ -7892,13 +8285,13 @@ msgstr "_Contact (FIXME)"
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:44
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Depurar"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:48
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:53
 msgid "_Help"
 msgstr "A_yuda"
 
@@ -7930,8 +8323,8 @@ msgstr "_Note (FIXME)"
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:115
+#: ui/evolution-task-editor-dialog.xml.h:83 ui/evolution.xml.h:60
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
@@ -7940,7 +8333,7 @@ msgid "_Select All"
 msgstr "_Seleccionar todo"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:63
 msgid "_Task (FIXME)"
 msgstr "_Task (FIXME)"
 
@@ -7948,6 +8341,11 @@ msgstr "_Task (FIXME)"
 msgid "_Unread Item (FIXME)"
 msgstr "_Unread Item (FIXME)"
 
+#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:55
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:65
+msgid "_View"
+msgstr "_Vista"
+
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Add Service"
 msgstr "Añadir Servicio"
@@ -7968,29 +8366,33 @@ msgstr "Configuración del Resumen de Trabajo..."
 msgid "New Mail"
 msgstr "Nuevo"
 
+#: ui/evolution-mail.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "Aplicar filtros a los mensajes seleccionados"
+
 #: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "Aplicar cualquier filtro nuevo al correo en este buzón"
+msgid "Cancel"
+msgstr "Cancelar"
 
 #: ui/evolution-mail.xml.h:3
+msgid "Cancel the current mail operation"
+msgstr "Cancelar la operación de correo actual"
+
+#: ui/evolution-mail.xml.h:4
 msgid "Change the properties of this folder"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:5
 msgid "Compose"
 msgstr "Nuevo"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Escribir un nuevo mensaje"
-
 #: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "Configurar la carpeta..."
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Responder a todos los destinatarios del mensaje seleccionado"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Copiar mensaje a una nueva carpeta"
+#: ui/evolution-mail.xml.h:7
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Responder al remitente del mensaje seleccionado"
 
 #: ui/evolution-mail.xml.h:9
 msgid "Copy selected messages to another folder"
@@ -8000,305 +8402,397 @@ msgstr "Copiar mensajes seleccionados a otra carpeta"
 msgid "Create _Virtual Folder From Message"
 msgstr "Crear una Carpeta _Virtual según el mensaje"
 
+#: ui/evolution-mail.xml.h:11
+msgid "Create a rule to filter messages from this sender"
+msgstr "Crear una regla para filtrar los mensajes de este remitente"
+
 #: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "Borrar los mensajes seleccionados"
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Crear una regla para filtrar los mensajes de estos destinatarios"
+
+#: ui/evolution-mail.xml.h:13
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Crear una regla para filtrar los mensajes de esta lista de correo"
 
 #: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Mostrar la cabecera de los mensajes"
+msgid "Create a rule to filter messages with this subject"
+msgstr "Crear una regla para filtrar los mensajes con este asunto"
 
 #: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Editar mensaje"
+msgid "Create a virtual folder for these recipients"
+msgstr "Crear una carpeta virtual para estos destinatarios"
 
 #: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Editar el mensaje actual"
+msgid "Create a virtual folder for this mailing list"
+msgstr "Crear una carpeta virtual para esta lista de correo"
 
 #: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Vaciar _Papelera"
+msgid "Create a virtual folder for this sender"
+msgstr "Crear una carpeta virtual para este remitente"
 
 #: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "Comprimir"
+msgid "Create a virtual folder for this subject"
+msgstr "Crear una carpeta virtual para este asunto"
 
 #: ui/evolution-mail.xml.h:19
+msgid "Create or edit mail accounts and other preferences"
+msgstr "Crear o editar cuentas de correo y otras preferencias"
+
+#: ui/evolution-mail.xml.h:20
+msgid "Create or edit rules for filtering new mail"
+msgstr "Crear o editar reglas para el filtrado de mensajes"
+
+#: ui/evolution-mail.xml.h:21
+msgid "Create or edit virtual folder definitions"
+msgstr "Crear o editar definiciones de carpetas virtuales"
+
+#: ui/evolution-mail.xml.h:23
+msgid "Display the next message"
+msgstr "Mostrar el mensaje siguiente"
+
+#: ui/evolution-mail.xml.h:24
+msgid "Display the previous message"
+msgstr "Mostrar el mensaje anterior"
+
+#: ui/evolution-mail.xml.h:25
+msgid "Empty _Trash"
+msgstr "Vaciar _Papelera"
+
+#: ui/evolution-mail.xml.h:26
 msgid "Filter on Mailing _List"
 msgstr "Filtrar según la _lista de correo"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:27
 msgid "Filter on Se_nder"
 msgstr "Filtrar según el remite_nte"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:28
 msgid "Filter on _Recipients"
 msgstr "Filtrar según los destinata_rios"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:29
 msgid "Filter on _Subject"
 msgstr "Filtrar según el a_sunto"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Eliminar todos los mensajes marcados para borrar"
+#: ui/evolution-mail.xml.h:30
+msgid "Force images in HTML mail to be loaded"
+msgstr "Forzar que las imágenes en los correos en HTML sean cargadas"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:31
 msgid "Forget _Passwords"
 msgstr "Olvidar _contraseña"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:32
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Olvidar las contraseñas recordadas con lo que será preguntado de nuevo"
+
+#: ui/evolution-mail.xml.h:34
 msgid "Forward As"
 msgstr "Reenviar como"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "Reenviar dentro del mensaje"
+#: ui/evolution-mail.xml.h:35
+msgid "Forward _Attached"
+msgstr "Reenviar _Adjunto"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "Reenviar el mensaje seleccionado a alguien"
+#: ui/evolution-mail.xml.h:36
+msgid "Forward _Inline"
+msgstr "Reenviar _dentro del mensaje"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Reenviar este mensaje incluido en su correo, para que pueda editarlo"
+#: ui/evolution-mail.xml.h:37
+msgid "Forward _Quoted"
+msgstr "Reenviar _Citado"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "_Cabecera completa"
+#: ui/evolution-mail.xml.h:38
+msgid "Forward the selected message in the body of a new message"
+msgstr "Reenviar el mensaje seleccionado en el cuerpo de un nuevo mensaje"
 
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "Ir al mensaje siguiente"
+#: ui/evolution-mail.xml.h:39
+msgid "Forward the selected message quoted like a reply"
+msgstr "Reenviar el mensaje seleccionado citado como una respuesta"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "Ir al mensaje anterior"
+#: ui/evolution-mail.xml.h:40
+msgid "Forward the selected message to someone"
+msgstr "Reenviar el mensaje seleccionado a alguien"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "Ocultar Mensajes Borrados"
+#: ui/evolution-mail.xml.h:41
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Reenviar el mensaje seleccionado como un adjunto a alguien"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:42
 msgid "Hide S_elected Messages"
 msgstr "Ocultar los mensajes _seleccionados"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:43
 msgid "Hide _Deleted Messages"
 msgstr "Ocultar mensajes _borrados"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:44
 msgid "Hide _Read messages"
 msgstr "Ocultar mensajes _leídos"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "Invertir selección"
+#: ui/evolution-mail.xml.h:45
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:46
+msgid "Load _Images"
+msgstr "Cargar _Imágenes"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Manage _Subscriptions..."
 msgstr "Administrar _suscripciones..."
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:48
+msgid "Mar_k As Read"
+msgstr "Mar_car como Leído"
+
+#: ui/evolution-mail.xml.h:49
 msgid "Mark All as R_ead"
 msgstr "Marcar todos como l_eídos"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "Marcar como leído"
-
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:50
 msgid "Mark As U_nread"
 msgstr "Marcar como _no leído"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:51
+msgid "Mark all visible messages as read"
+msgstr "Marcar los mensajes visibles como leídos"
+
+#: ui/evolution-mail.xml.h:52
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leidos"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:53
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leidos"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:54
+msgid "Mark the selected messages for deletion"
+msgstr "Marcar los mensajes seleccionados para borrar"
+
+#: ui/evolution-mail.xml.h:55
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "Mover mensaje a una nueva carpeta"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:56
 msgid "Move selected messages to another folder"
 msgstr "Mover mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "Abrir en una nueva ventana"
-
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
-msgstr "Abrir el mensaje actual en una nueva ventana"
-
 #: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "Imprimir vista previa del mensaje..."
+msgid "Open a window for composing a mail message"
+msgstr "Abrir una ventana para escribir un mensaje de correo"
 
 #: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "Imprimir el mensaje en la impresora"
+msgid "Open the selected message in a new window"
+msgstr "Abrir el mensaje seleccionado en una nueva ventana"
 
 #: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "Imprimir mensaje..."
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Abrir el mensaje seleccionado para reenviarlo"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr "Redirigir (ARREGLAME: implementame)"
+#: ui/evolution-mail.xml.h:61
+msgid "Permanently remove all deleted messages from all folders"
+msgstr ""
+"Eliminar permanentemente todos los mansajes borrados de todas las carpetas"
+
+#: ui/evolution-mail.xml.h:62
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Eliminar permanentemente todos los mansajes borrados de esta carpeta"
+
+#: ui/evolution-mail.xml.h:66
+msgid "Print Message..."
+msgstr "Imprimir Mensaje..."
 
 #: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "Resp. todos"
+msgid "Print Preview..."
+msgstr "Vista previa..."
+
+#: ui/evolution-mail.xml.h:68
+msgid "Print message to the printer"
+msgstr "Imprimir el mensaje en la impresora"
 
 #: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "Resp. remitente"
+msgid "Redirect (FIXME: implement me)"
+msgstr "Redirigir (ARREGLAME: implementame)"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:73
 msgid "S_earch Message"
 msgstr "Buscar M_ensaje"
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "F_uente"
+#: ui/evolution-mail.xml.h:74
+msgid "Save the message as a text file"
+msgstr "Guardar el mensaje en un archivo de texto"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "Guardar el mensaje en un nuevo archivo"
+#: ui/evolution-mail.xml.h:75
+msgid "Search for text in the body of the displayed message"
+msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:76 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ui/evolution-mail.xml.h:76
+#: ui/evolution-mail.xml.h:77
 msgid "Select _Thread"
 msgstr "Seleccionar _Hilo"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send / Receive"
-msgstr "Enviar / Recibir"
-
 #: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Enviar una respuesta a la presona que le envio este mensaje"
+msgid "Select all and only the messages that are not currently selected"
+msgstr "Selecciona todos los mensajes que no están seleccionados actualmente"
 
 #: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "Enviar un solo mensaje para responder a todo el correo seleccionado"
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+"Selecciona todos los mensajes en el mismo hilo que el mensaje seleccionado"
 
 #: ui/evolution-mail.xml.h:80
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr ""
-"Enviar el correo en la cola\n"
-"    y obtener el nuevo"
+msgid "Select all visible messages"
+msgstr "Seleccionar todos los mensajes visibles"
+
+#: ui/evolution-mail.xml.h:81
+msgid "Send / Receive"
+msgstr "Enviar / Recibir"
 
 #: ui/evolution-mail.xml.h:82
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar el correo en la cola y obtener el nuevo"
 
 #: ui/evolution-mail.xml.h:83
+msgid "Show Email _Source"
+msgstr "Mostrar la Fuente del Men_saje"
+
+#: ui/evolution-mail.xml.h:84
+msgid "Show Full _Headers"
+msgstr "Mostrar cabeceras completas"
+
+#: ui/evolution-mail.xml.h:85
 msgid "Show _All"
 msgstr "Mostrar _todo"
 
-#: ui/evolution-mail.xml.h:85
+#: ui/evolution-mail.xml.h:86
+msgid "Show message in the normal style"
+msgstr "Mostrar mensajes en el estilo normal"
+
+#: ui/evolution-mail.xml.h:87
+msgid "Show message with all email headers"
+msgstr "Mostrar mensajes con todas las cabeceras"
+
+#: ui/evolution-mail.xml.h:88
+msgid "Show messages that have been temporarily hidden"
+msgstr "Mostrar mensajes que han estado ocultos temporalmente"
+
+#: ui/evolution-mail.xml.h:89
+msgid "Show the raw email source of the message"
+msgstr "Mostrar la fuentes sin formatear del mensaje"
+
+#: ui/evolution-mail.xml.h:90
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Suscribirse o desuscribirse de carpetas de los servidores remotos"
+
+#: ui/evolution-mail.xml.h:91
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Oculta temporalmente todos los mensajes que han sido leiods"
+
+#: ui/evolution-mail.xml.h:92
+msgid "Temporarily hide the selected messages"
+msgstr "Oculta temporalmente los mensajes seleccionados"
+
+#: ui/evolution-mail.xml.h:93
 msgid "Threaded Message list"
 msgstr "Lista de Mensajes Encadenados"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail.xml.h:94
 msgid "Un-delete the selected messages"
 msgstr "Recuperar los mensajes seleccionados"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "Recuperar"
+#: ui/evolution-mail.xml.h:95
+msgid "VFolder on Mailing _List..."
+msgstr "Carpeta virtual según la _Lista de Correo..."
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr "Ver las fuentes del mensaje"
+#: ui/evolution-mail.xml.h:96
+msgid "VFolder on Se_nder..."
+msgstr "VFolder según el Remite_nte..."
 
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail.xml.h:97
+msgid "VFolder on _Recipients..."
+msgstr "VFolder según los Destinata_rios..."
+
+#: ui/evolution-mail.xml.h:98
+msgid "VFolder on _Subject..."
+msgstr "VFolder según el A_sunto..."
+
+#: ui/evolution-mail.xml.h:99
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail.xml.h:100
 msgid "_Apply Filters"
 msgstr "_Aplicar filtro"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "_Adjunto"
+#: ui/evolution-mail.xml.h:101
+msgid "_Copy to Folder"
+msgstr "_Copiar a la Carpeta"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail.xml.h:102
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail.xml.h:104
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail.xml.h:105
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:32
+#: ui/evolution-mail.xml.h:106 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Inline"
-msgstr "_Incluido en línea"
+#: ui/evolution-mail.xml.h:107
+msgid "_Forward Message"
+msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:108 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Invertir selección"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail.xml.h:109
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ui/evolution-mail.xml.h:106
+#: ui/evolution-mail.xml.h:110
 msgid "_Mail Settings..."
 msgstr "_Configuración del correo..."
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Open Selected Items"
-msgstr "Abrir element_os seleccionados"
-
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr "_Citado"
-
 #: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "_Responder"
+msgid "_Message Display"
+msgstr "_Mostrar Mensaje"
 
 #: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "Reenviar Mensaje"
+msgid "_Move to Folder"
+msgstr "_Mover a la Carpeta"
+
+#: ui/evolution-mail.xml.h:113
+msgid "_Normal Display"
+msgstr "Vista _Normal"
 
 #: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "Guardar men_saje como..."
+msgid "_Open Message"
+msgstr "_Abrir Mensaje"
 
-#: ui/evolution-mail.xml.h:115
+#: ui/evolution-mail.xml.h:116
+msgid "_Re-send Message"
+msgstr "_Reenviar Mensaje"
+
+#: ui/evolution-mail.xml.h:119
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr "_Encadenados"
+#: ui/evolution-mail.xml.h:120
+msgid "_Threaded Message List"
+msgstr "_Lista de Mensajes Encadenados"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -8314,142 +8808,154 @@ msgid "Encrypt this message with PGP"
 msgstr "Encriptar este mensaje con PGP"
 
 #: ui/evolution-message-composer.xml.h:6
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr "Encripta este mensaje con su Certificado de Encriptación S/MIME"
+
+#: ui/evolution-message-composer.xml.h:7
 msgid "F_ormat"
 msgstr "F_ormatear"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:8
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:9
 msgid "Insert a file as text into the message"
 msgstr "Insertar un archivo como texto en el mensaje"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:10
 msgid "Insert text file..."
 msgstr "Insertar un archivo de texto..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Encrypt"
 msgstr "Encriptar con PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:15
+msgid "S/MIME Encrypt"
+msgstr "Encriptar con S/MIME"
+
+#: ui/evolution-message-composer.xml.h:16
+msgid "S/MIME Sign"
+msgstr "Firmar con S/MIME"
+
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save _Draft"
 msgstr "Guardar _Borrador"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save in _folder... (FIXME)"
 msgstr "Save in _folder... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the message in a specified folder"
 msgstr "Guardara el mensaje a una carpeta específica"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send _Later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the message later"
 msgstr "Enviar el mensaje más tarde"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Enviar el mensaje ahora"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send this message now"
 msgstr "Enviar este mensaje ahora"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:32
 msgid "Show / hide attachments"
 msgstr "Mostrar / ocultar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show _attachments"
 msgstr "Mostrar _adjuntos"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show attachments"
 msgstr "Mostrar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:35
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con tu clave PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:36
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Firmar este mensaje con su certificado de firma S/MIME"
+
+#: ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Activa si se muestra el campo CCO"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the CC field is displayed"
 msgstr "Activa si se muestra el campo CC"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Activa si se muestra el selector 'De'"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Activa si se muestra el campo Responder-A"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:41
 msgid "_Bcc Field"
 msgstr "Campo Cc_o"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:47
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:50
 msgid "_Insert text file... (FIXME)"
 msgstr "_Insert text file... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Seguridad"
 
@@ -8541,7 +9047,7 @@ msgstr "Deshacer"
 msgid "Undo the last action"
 msgstr "Deshacer la última acción"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:42
 msgid "_Appointment (FIXME)"
 msgstr "_Appointment (FIXME)"
 
@@ -8577,130 +9083,210 @@ msgstr "_Tarea"
 msgid "About Evolution..."
 msgstr "Acerca de Evolution..."
 
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
+msgstr "Añadir a la barra de atajo_s"
+
 #: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
+msgstr "Cambiar el nombre de esta carpeta"
+
+#: ui/evolution.xml.h:4
+msgid "Change the properties for this folder"
+msgstr "Cambiar las propiedades de esta carpeta"
+
+#: ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:7
+msgid "Copy this folder"
+msgstr "Copiar esta carpeta"
+
+#: ui/evolution.xml.h:8
+msgid "Create _New Folder..."
+msgstr "Creando una _Nueva Carpeta..."
+
+#: ui/evolution.xml.h:9
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Crear un enlace a esta carpeta en la lista de atajos"
+
+#: ui/evolution.xml.h:10
+msgid "Create a new folder"
+msgstr "Creando una nueva carpeta"
+
+#: ui/evolution.xml.h:11
 msgid "Customi_ze Toolbars..."
 msgstr "Personali_zar barras de herramientas..."
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:12
 msgid "Customize"
 msgstr "Personalizar"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:13
 msgid "Customize toolbars"
 msgstr "Personalizar barras de herramientas"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Mostrar una carpeta distinta"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+msgid "Evolution _FAQ"
+msgstr "_FAQ de Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "_Ventana de Evolution"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:18
 msgid "Evolution bar _shortcut"
 msgstr "Barra de _atajos de Evolution"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Exit the program"
 msgstr "Salir del programa"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Getting _Started"
 msgstr "Comenzando"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:21
 msgid "Import an external file format"
 msgstr "Importar un formato de archivo externo"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:22
 msgid "Main toolbar"
 msgstr "Barra de herramientas principal"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:23
+msgid "Move this folder to another place"
+msgstr "Mueve esta carpeta a otro sitio"
+
+#: ui/evolution.xml.h:24
+msgid "Open in New Window"
+msgstr "Abrir en una nueva ventana"
+
+#: ui/evolution.xml.h:25
+msgid "Open in New _Window"
+msgstr "Abrir en una Nueva _Ventana"
+
+#: ui/evolution.xml.h:26
+msgid "Open this folder in an other window"
+msgstr "Abre esta carpeta en una nueva ventana"
+
+#: ui/evolution.xml.h:27
 msgid "Show information about Evolution"
 msgstr "Mostrar información acerca de Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "Enviar reporte de fallo"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar un reporte de fallo usando Bug Buddy."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:31
+msgid "Toggle"
+msgstr "Activar"
+
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:34
+msgid "Toggle whether we are working offline."
+msgstr "Activar si se estamos trabajando desconectados o no."
+
+#: ui/evolution.xml.h:35
 msgid "Using the C_ontact Manager"
 msgstr "Usando el administrador de c_ontactos"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Calendar"
 msgstr "Usando el _calendario"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:37
 msgid "Using the _Mailer"
 msgstr "Usando el _correo"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:38
+msgid "View the selected folder"
+msgstr "Ver la carpeta seleccionada"
+
+#: ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:40
 msgid "_About Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:41
 msgid "_Actions"
 msgstr "_Acciones"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:45
+msgid "_Copy..."
+msgstr "_Copiar..."
+
+#: ui/evolution.xml.h:47
+msgid "_Delete this folder"
+msgstr "_Borrar esta carpeta"
+
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "Barra de _carpetas"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:52
 msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:54
 msgid "_Import file..."
 msgstr "_Importar archivo..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:55
 msgid "_Index"
 msgstr "_Índice"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:56
 msgid "_Mail message"
 msgstr "_Enviar mensaje"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:57
+msgid "_Move..."
+msgstr "_Mover..."
+
+#: ui/evolution.xml.h:59
 msgid "_New Folder"
 msgstr "_Nueva carpeta"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:61
+msgid "_Rename..."
+msgstr "_Renombrar..."
+
+#: ui/evolution.xml.h:62
 msgid "_Shortcut Bar"
 msgstr "Barra de atajo_s"
 
+#: ui/evolution.xml.h:66
+msgid "_Work Offline"
+msgstr "_Trabajar Desconectado"
+
 #: views/addressbook/galview.xml.h:1
 msgid "Adress Cards"
 msgstr "Tarjeta de visita"
@@ -8816,11 +9402,11 @@ msgstr "Todos los participantes"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:176
 msgid "_Current View"
 msgstr "_Vista actual"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:202
 msgid "Define Views"
 msgstr "Definir Vistas"
 
@@ -8852,25 +9438,29 @@ msgstr "La fecha debe estar en el formato: %s"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Guardar búsqueda"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:239
 msgid "Advanced Search"
 msgstr "Búqueda avanzada"
 
-#: widgets/misc/e-filter-bar.c:317 widgets/misc/e-filter-bar.h:97
-msgid "Advanced ..."
-msgstr "Avanzada..."
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Guardar como..."
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Save As ..."
-msgstr "Guardar como ..."
+#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Mostrar todo"
+
+#: widgets/misc/e-filter-bar.h:96 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Editar..."
 
-#: widgets/misc/e-filter-bar.h:96
-msgid "Edit ..."
-msgstr "Editar ..."
+#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avanzado..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -8893,7 +9483,7 @@ msgstr "Mensaje"
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Bus_car"
 
@@ -8917,12 +9507,141 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#~ msgid "Mark Complete"
+#~ msgstr "Marcar como completa"
+
+#~ msgid "Edit the task"
+#~ msgstr "Editar la tarea"
+
+#~ msgid "Remove the selected folder"
+#~ msgstr "Borrar la carpeta seleccionada"
+
+#~ msgid "_Remove"
+#~ msgstr "_Quitar"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "No podemos abrir esta agenda de direcciones. Esto puede\n"
+#~ "significar que, o bien ha introducido un URI incorrecto,\n"
+#~ "o que ha intentado acceder a un servidor LDAP y no ha\n"
+#~ "compilado el soporte para LDAP. Si ha introducido un URI,\n"
+#~ "compruébelo y reinténtelo. De no ser así, posiblemente a\n"
+#~ "intentado acceder a un servidor LDAP. Si desea poder emplear\n"
+#~ "LDAP, necesitará descargar e instalar OpenLDAP y recompilar\n"
+#~ "e instalar evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Show all "
+#~ msgstr "Mostrar todo "
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Aplicar cualquier filtro nuevo al correo en este buzón"
+
+#~ msgid "Compose a new message"
+#~ msgstr "Escribir un nuevo mensaje"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "Configurar la carpeta..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copiar mensaje a una nueva carpeta"
+
+#~ msgid "Display all of the message headers"
+#~ msgstr "Mostrar la cabecera de los mensajes"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Editar el mensaje actual"
+
+#~ msgid "Expunge"
+#~ msgstr "Comprimir"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "Eliminar todos los mensajes marcados para borrar"
+
+#~ msgid "Forward inline"
+#~ msgstr "Reenviar dentro del mensaje"
+
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr ""
+#~ "Reenviar este mensaje incluido en su correo, para que pueda editarlo"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Ocultar Mensajes Borrados"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Invertir selección"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Mover mensaje a una nueva carpeta"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Imprimir vista previa del mensaje..."
+
+#~ msgid "Reply to all"
+#~ msgstr "Resp. todos"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Resp. remitente"
+
+#~ msgid "S_ource"
+#~ msgstr "F_uente"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Enviar una respuesta a la presona que le envio este mensaje"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Enviar un solo mensaje para responder a todo el correo seleccionado"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "Enviar el correo en la cola\n"
+#~ "    y obtener el nuevo"
+
+#~ msgid "Undelete"
+#~ msgstr "Recuperar"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Ver las fuentes del mensaje"
+
+#~ msgid "_Attachment"
+#~ msgstr "_Adjunto"
+
+#~ msgid "_Open Selected Items"
+#~ msgstr "Abrir element_os seleccionados"
+
+#~ msgid "_Reply"
+#~ msgstr "_Responder"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Guardar men_saje como..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Encadenados"
+
+#~ msgid "Send the message now"
+#~ msgstr "Enviar el mensaje ahora"
+
+#~ msgid "Advanced ..."
+#~ msgstr "Avanzada..."
+
+#~ msgid "Save As ..."
+#~ msgstr "Guardar como ..."
+
 #~ msgid "%s is not a selectable folder"
 #~ msgstr "%s no es una carpeta seleccionable"
 
-#~ msgid "You must be working online to complete this operation"
-#~ msgstr "Debe estar trabajando en línea para competar esta operación"
-
 #~ msgid "VFolder on Subject"
 #~ msgstr "VFolder según el asunto"
 
@@ -8932,9 +9651,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "VFolder on Recipients"
 #~ msgstr "VFolder según los destinatarios"
 
-#~ msgid "Save As..."
-#~ msgstr "Guardar como..."
-
 #~ msgid "Mark as Read"
 #~ msgstr "Marcar como leído"