Updated Spanish translation.

svn path=/trunk/; revision=10176

2 files changed, 1508 insertions, 1308 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 6bab33a7cd..066a6a5f91 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-10  Héctor García Álvarez <hector@scouts-es.org>
+
+        * es.po: Updated Spanish translation.
+	
 2001-06-10  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
 
 	* sk.po: Updated Slovak translation.
diff --git a/po/es.po b/po/es.po
index 873c81be68..82395f073a 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-21 19:19+0200\n"
+"POT-Creation-Date: 2001-06-10 22:11+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:3314
+#: addressbook/backend/ebook/e-card.c:3324
 msgid "Card: "
 msgstr "Tarjeta: "
 
-#: addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3326
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +26,7 @@ msgstr ""
 "\n"
 "Nombre:"
 
-#: addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3327
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 "  Prefijo:    "
 
-#: addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3328
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +42,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3319
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +50,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3330
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3321
+#: addressbook/backend/ebook/e-card.c:3331
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 "  Sufijo:     "
 
-#: addressbook/backend/ebook/e-card.c:3335
+#: addressbook/backend/ebook/e-card.c:3345
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "Fecha de nacimiento: "
 
-#: addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +82,7 @@ msgstr ""
 "\n"
 "Dirección:"
 
-#: addressbook/backend/ebook/e-card.c:3348
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +90,7 @@ msgstr ""
 "\n"
 "  Dirección postal: "
 
-#: addressbook/backend/ebook/e-card.c:3349
+#: addressbook/backend/ebook/e-card.c:3359
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +98,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3360
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +106,7 @@ msgstr ""
 "\n"
 "  Calle:       "
 
-#: addressbook/backend/ebook/e-card.c:3351
+#: addressbook/backend/ebook/e-card.c:3361
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 "  Ciudad:      "
 
-#: addressbook/backend/ebook/e-card.c:3352
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +122,7 @@ msgstr ""
 "\n"
 "  Región:      "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +130,7 @@ msgstr ""
 "\n"
 "  Código postal: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3364
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +138,7 @@ msgstr ""
 "\n"
 "  País:        "
 
-#: addressbook/backend/ebook/e-card.c:3367
+#: addressbook/backend/ebook/e-card.c:3377
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +146,7 @@ msgstr ""
 "\n"
 "Etiqueta de envío: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3389
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +154,7 @@ msgstr ""
 "\n"
 "Teléfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3382
+#: addressbook/backend/ebook/e-card.c:3392
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +162,7 @@ msgstr ""
 "\n"
 "Teléfono:"
 
-#: addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3416
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +170,7 @@ msgstr ""
 "\n"
 "Correo electrónico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3419
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "Correo electrónico:"
 
-#: addressbook/backend/ebook/e-card.c:3428
+#: addressbook/backend/ebook/e-card.c:3438
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "Programa de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3434
+#: addressbook/backend/ebook/e-card.c:3444
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3442
+#: addressbook/backend/ebook/e-card.c:3452
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +202,7 @@ msgstr ""
 "\n"
 "Localización geográfica: "
 
-#: addressbook/backend/ebook/e-card.c:3446
+#: addressbook/backend/ebook/e-card.c:3456
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +210,7 @@ msgstr ""
 "\n"
 "Cargo: "
 
-#: addressbook/backend/ebook/e-card.c:3458
+#: addressbook/backend/ebook/e-card.c:3468
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +218,7 @@ msgstr ""
 "\n"
 "Organización: "
 
-#: addressbook/backend/ebook/e-card.c:3459
+#: addressbook/backend/ebook/e-card.c:3469
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +226,7 @@ msgstr ""
 "\n"
 "  Nombre: "
 
-#: addressbook/backend/ebook/e-card.c:3460
+#: addressbook/backend/ebook/e-card.c:3470
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +234,7 @@ msgstr ""
 "\n"
 "  Unidad: "
 
-#: addressbook/backend/ebook/e-card.c:3461
+#: addressbook/backend/ebook/e-card.c:3471
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +242,7 @@ msgstr ""
 "\n"
 "  Unidad2: "
 
-#: addressbook/backend/ebook/e-card.c:3462
+#: addressbook/backend/ebook/e-card.c:3472
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidad3: "
 
-#: addressbook/backend/ebook/e-card.c:3463
+#: addressbook/backend/ebook/e-card.c:3473
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidad4: "
 
-#: addressbook/backend/ebook/e-card.c:3467
+#: addressbook/backend/ebook/e-card.c:3477
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +266,7 @@ msgstr ""
 "\n"
 "categorías: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3478
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +284,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3481
+#: addressbook/backend/ebook/e-card.c:3491
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +292,7 @@ msgstr ""
 "\n"
 "Cadena única: "
 
-#: addressbook/backend/ebook/e-card.c:3484
+#: addressbook/backend/ebook/e-card.c:3494
 msgid ""
 "\n"
 "Public Key: "
@@ -300,11 +300,11 @@ msgstr ""
 "\n"
 "Llave pública: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3755
 msgid "Multiple VCards"
 msgstr "VCards Múltiples"
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3763
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -360,8 +360,9 @@ msgstr "No pude leer información de la aplicación de direcciones del pilot"
 
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1 filter/filter.glade.h:1
 #: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Añadir"
@@ -383,8 +384,8 @@ msgid "C_ontacts..."
 msgstr "C_ontactos..."
 
 #: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
@@ -393,7 +394,7 @@ msgid "Contact Editor"
 msgstr "Editor de contactos"
 
 #: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor.c:115
 msgid "Details"
 msgstr "Detalles"
 
@@ -419,7 +420,7 @@ msgid "Phone Types"
 msgstr "Tipos de teléfono"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Primary Email"
 msgstr "Correo electrónico principal"
 
@@ -432,7 +433,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:84
+#: mail/mail-config.glade.h:94
 msgid "_Add"
 msgstr "_Añadir"
 
@@ -457,9 +458,10 @@ msgid "_Company:"
 msgstr "_Compañía:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: 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
+#: mail/folder-browser.c:725 mail/mail-config.glade.h:95
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:108
+#: ui/evolution-task-editor-dialog.xml.h:69 ui/evolution-tasks.xml.h:9
+#: ui/evolution.xml.h:47
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -511,100 +513,101 @@ msgstr "Es_tá es la dirección de correo"
 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:733
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1309
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/contact-editor/e-contact-editor.c:1243
 msgid "Business 2"
 msgstr "Trabajo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Callback"
 msgstr "Rellamada"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Car"
 msgstr "Coche"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Company"
 msgstr "Compañía"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/contact-editor/e-contact-editor.c:1249
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/contact-editor/e-contact-editor.c:1252
 msgid "Mobile"
 msgstr "Móvil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
+#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/contact-editor/e-contact-editor.c:1311
+#: mail/mail-config.glade.h:55
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/contact-editor/e-contact-editor.c:1254
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Other Fax"
 msgstr "Otro fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Pager"
 msgstr "Papel"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/contact-editor/e-contact-editor.c:1256
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/contact-editor/e-contact-editor.c:1259
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Email 2"
 msgstr "Correo electrónico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Email 3"
 msgstr "Correo electrónico 3"
 
@@ -612,20 +615,20 @@ msgstr "Correo electrónico 3"
 msgid "Delete Contact?"
 msgstr "¿Borrar contacto?"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/contact-editor/e-contact-quick-add.c:234
 msgid "Contact Quick-Add"
 msgstr "Añadir Contacto"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/contact-editor/e-contact-quick-add.c:236
 msgid "Edit Full"
 msgstr "Editar Todo"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/contact-editor/e-contact-quick-add.c:277
+#: addressbook/gui/widgets/e-addressbook-view.c:699
 msgid "Full Name"
 msgstr "Nombre Completo"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/contact-editor/e-contact-quick-add.c:283
 msgid "E-mail"
 msgstr "Correo electrónico"
 
@@ -741,25 +744,16 @@ msgstr "_Sufijo:"
 msgid "_Title:"
 msgstr "_Título:"
 
-#: addressbook/gui/component/addressbook.c:244
-msgid "As _Minicards"
-msgstr "Como _mini tarjetas"
-
-#: addressbook/gui/component/addressbook.c:250
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Como _Tabla"
-
-#: addressbook/gui/component/addressbook.c:410
+#: addressbook/gui/component/addressbook.c:341
 #, c-format
 msgid "Enter password for %s"
 msgstr "Introduzca la contraseña para %s"
 
-#: addressbook/gui/component/addressbook.c:438
+#: addressbook/gui/component/addressbook.c:369
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/component/addressbook.c:376
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -769,7 +763,7 @@ msgstr ""
 "que ha introducido una URI erronea, o que el servidor LDAP está\n"
 "caido"
 
-#: addressbook/gui/component/addressbook.c:450
+#: addressbook/gui/component/addressbook.c:381
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -781,7 +775,7 @@ msgstr ""
 "de las fuentes del CVS una vez que haya obtenido LDAP del\n"
 "siguiente enlace.\n"
 
-#: addressbook/gui/component/addressbook.c:458
+#: addressbook/gui/component/addressbook.c:389
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -789,19 +783,19 @@ 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:618 calendar/gui/gnome-cal.c:233
+#: addressbook/gui/component/addressbook.c:549 calendar/gui/gnome-cal.c:233
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:550
 msgid "Name contains"
 msgstr "El nombre contiene"
 
-#: addressbook/gui/component/addressbook.c:620
+#: addressbook/gui/component/addressbook.c:551
 msgid "Email contains"
 msgstr "El mensaje contiene"
 
-#: addressbook/gui/component/addressbook.c:763
+#: addressbook/gui/component/addressbook.c:697
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrará el visor de carpetas"
 
@@ -824,7 +818,7 @@ 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:52
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:59
 msgid "Password"
 msgstr "Clave"
 
@@ -857,12 +851,12 @@ msgid "FIXME Bind DN Help text here"
 msgstr "FIXME Bind DN Help text here"
 
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:68
 msgid "Remember this password"
 msgstr "Recuerda esta contraseña"
 
 #: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:39
 msgid "Host:"
 msgstr "Servidor:"
 
@@ -899,7 +893,7 @@ msgid "Advanced LDAP Options"
 msgstr "Opciones avanzadas de LDAP"
 
 #: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:60
 msgid "Path:"
 msgstr "Ruta:"
 
@@ -928,7 +922,7 @@ msgstr ""
 "información relevante acerca de ella."
 
 #: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:49
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -952,19 +946,20 @@ msgstr "Fuentes de la agenda de direcciones"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: 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:23
-#: mail/message-browser.c:202 ui/evolution-addressbook.xml.h:3
+#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/e-meeting-dialog.glade.h:8 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
+#: mail/message-browser.c:211 ui/evolution-addressbook.xml.h:7
 #: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
-#: ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-task-editor-dialog.xml.h:18 ui/evolution-tasks.xml.h:3
 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:28
+#: mail/mail-config.glade.h:33
 msgid "Edit"
 msgstr "Editar"
 
@@ -1043,7 +1038,7 @@ 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:161
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
+#: composer/e-msg-composer-attachment-bar.c:473 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"
@@ -1196,155 +1191,171 @@ msgstr "z"
 
 #: 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
+#: addressbook/gui/widgets/e-addressbook-view.c:538
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 msgid "Save as VCard"
 msgstr "Guardar como vCard"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 msgid "Send contact to other"
 msgstr "Enviar el contacto a otro"
 
 #
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 msgid "Send message to contact"
 msgstr "Enviar un mensaje al contacto"
 
 #: 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:65 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:601 mail/message-browser.c:208
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:70 ui/evolution-tasks.xml.h:6
 msgid "Print"
 msgstr "Imprimir"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.c:697
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aquí para añadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/widgets/e-addressbook-view.c:698
 msgid "File As"
 msgstr "Archivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:700
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "Primary Phone"
 msgstr "Teléfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Assistant Phone"
 msgstr "Teléfono del Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Business Phone"
 msgstr "Teléfono del Trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Callback Phone"
 msgstr "Teléfono para rellamadas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Company Phone"
 msgstr "Teléfono de la compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Business Address"
 msgstr "Dirección del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Home Address"
 msgstr "Dirección de su casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Car Phone"
 msgstr "Teléfono del coche"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Business Phone 2"
 msgstr "Teléfono del trabajo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Home Phone 2"
 msgstr "Teléfono de casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Other Phone"
 msgstr "Otro teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Other Address"
 msgstr "Otra dirección"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Title"
 msgstr "Título"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Profession"
 msgstr "Profesión"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Manager"
 msgstr "Encargado"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Nickname"
 msgstr "Nick"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Spouse"
 msgstr "Cónyuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Free-busy URL"
 msgstr "URL de disponibilidad"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
+msgid "Done."
+msgstr "Hecho."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
+msgid "Error removing card"
+msgstr "Error eliminando tarjeta"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1111
+msgid "Removing cards..."
+msgstr "Eliminando tarjetas..."
+
+#: addressbook/gui/widgets/e-minicard.c:435
+msgid "Error modifying card"
+msgstr "Error modificando tarjeta"
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Guardar en la agenda de direcciones"
 
-#: addressbook/gui/widgets/e-minicard-view.c:216
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1616,8 +1627,8 @@ msgstr "Privado"
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
-#: calendar/gui/event-editor.c:1628
+#: calendar/gui/calendar-model.c:369 calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:356
 #: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Unknown"
 msgstr "Desconocido"
@@ -1639,21 +1650,21 @@ msgid "W"
 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:345 mail/message-list.c:689
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:696
 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:346 mail/message-list.c:688
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:695
 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:347 mail/message-list.c:687
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:347 mail/message-list.c:694
 msgid "Low"
 msgstr "Baja"
 
@@ -1668,25 +1679,25 @@ 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/dialogs/task-page.glade.h:12
 #: 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/dialogs/task-page.glade.h:9
 #: 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/dialogs/task-page.glade.h:6
 #: 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/dialogs/task-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:422 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
@@ -1722,9 +1733,9 @@ 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: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:46 shell/e-shell-view.c:1312
+#: calendar/gui/e-calendar-table.c:397 mail/mail-account-gui.c:997
+#: mail/mail-accounts.c:123 mail/mail-accounts.c:174
+#: mail/mail-config.glade.h:52 shell/e-shell-view.c:1395
 #: 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"
@@ -1750,7 +1761,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/dialogs/task-page.glade.h:18
 #: calendar/gui/e-calendar-table.c:348
 msgid "Undefined"
 msgstr "Sin definir"
@@ -1787,7 +1798,7 @@ msgstr "Citas"
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
+#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:1844
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tareas"
@@ -1800,7 +1811,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 mail/mail-config.glade.h:24
+#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:29
 msgid "Display"
 msgstr "Mostrar"
 
@@ -1851,6 +1862,145 @@ msgstr "Editas una cita"
 msgid "Snooze time (minutes)"
 msgstr "Tiempo de recordatorio (minutos)"
 
+#: calendar/gui/dialogs/alarm-page.c:255
+#, c-format
+msgid "%d days"
+msgstr "%d días"
+
+#: calendar/gui/dialogs/alarm-page.c:257
+msgid "1 day"
+msgstr "1 día"
+
+#: calendar/gui/dialogs/alarm-page.c:260
+#, c-format
+msgid "%d weeks"
+msgstr "%d semanas"
+
+#: calendar/gui/dialogs/alarm-page.c:262
+msgid "1 week"
+msgstr "1 semana"
+
+#: calendar/gui/dialogs/alarm-page.c:265
+#, c-format
+msgid "%d hours"
+msgstr "%d horas"
+
+#: calendar/gui/dialogs/alarm-page.c:267
+msgid "1 hour"
+msgstr "1 hora"
+
+#: calendar/gui/dialogs/alarm-page.c:270
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:272
+msgid "1 minute"
+msgstr "1 minuto"
+
+#: calendar/gui/dialogs/alarm-page.c:275
+#, c-format
+msgid "%d seconds"
+msgstr "%d segundos"
+
+#: calendar/gui/dialogs/alarm-page.c:277
+msgid "1 second"
+msgstr "1 segundo"
+
+#: calendar/gui/dialogs/alarm-page.c:302
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+msgid "Play a sound"
+msgstr "Tocar un sonido"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+msgid "Show a dialog"
+msgstr "Mostrar un diálogo"
+
+#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+msgid "Send an email"
+msgstr "Enviar un correo"
+
+#: calendar/gui/dialogs/alarm-page.c:314
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Run a program"
+msgstr "Ejecutar un programa"
+
+#: calendar/gui/dialogs/alarm-page.c:332
+msgid " before start of appointment"
+msgstr "antes del inicio de la cita"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+msgid " after start of appointment"
+msgstr "tras el inicio de la cita"
+
+#: calendar/gui/dialogs/alarm-page.c:345
+msgid " before end of appointment"
+msgstr "antes del fin de la cita"
+
+#: calendar/gui/dialogs/alarm-page.c:348
+msgid " after end of appointment"
+msgstr "tras el fin de la cita"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
+msgstr "Bases"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+msgid "Date/Time:"
+msgstr "Fecha/Hora:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Reminders"
+msgstr "Recordatorios"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:9 ui/evolution-calendar.xml.h:29
+msgid "Settings..."
+msgstr "Configuración..."
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resumen:"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "después de"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "antes"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "día(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "fin de la cita"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "hora(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:97
+msgid "minute(s)"
+msgstr "minuto(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "comienzo de cita"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr "05 minutos"
@@ -1942,7 +2092,7 @@ msgid "Fri"
 msgstr "Vier"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/recurrence-page.c:918
 msgid "Friday"
 msgstr "Viernes"
 
@@ -1971,7 +2121,7 @@ msgid "Mon"
 msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/dialogs/recurrence-page.c:914
 msgid "Monday"
 msgstr "Lunes"
 
@@ -1984,7 +2134,7 @@ msgid "Overdue Items:"
 msgstr "Elementos fuera de plazo:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:61
 msgid "Pick a color"
 msgstr "Elije un color"
 
@@ -1997,17 +2147,12 @@ msgstr "Prioridad"
 msgid "Remind me of all appointments"
 msgstr "Recuerdame todas las citas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Recordatorios"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sat"
 msgstr "Sab"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/recurrence-page.c:919
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -2032,7 +2177,7 @@ msgid "Sun"
 msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/recurrence-page.c:920
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -2045,7 +2190,7 @@ msgid "Thu"
 msgstr "Jue"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -2066,7 +2211,7 @@ msgid "Tue"
 msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/dialogs/recurrence-page.c:915
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -2079,7 +2224,7 @@ msgid "Wed"
 msgstr "Mier"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "Wednesday"
 msgstr "Miércoles"
 
@@ -2092,7 +2237,7 @@ 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:88
+#: mail/mail-config.glade.h:99
 msgid "seconds."
 msgstr "segundos."
 
@@ -2124,114 +2269,203 @@ 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
+#, c-format
 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
+#, c-format
 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
+#, c-format
 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:709
-msgid "Edit Task"
-msgstr "Editar Tarea"
-
-#: 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:717 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Task - %s"
-msgstr "Tarea - %s"
+#: calendar/gui/dialogs/event-editor.c:112
+msgid "Appointment"
+msgstr "Cita"
 
-#: 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/event-editor.c:117
+msgid "Reminder"
+msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
-msgid "No summary"
-msgstr "Sin resumen"
+#: calendar/gui/dialogs/event-editor.c:122
+msgid "Recurrence"
+msgstr "Recurrencia"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leto:"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Evento para todo e_l día"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-calendar-table.c:151
-#: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Clasificación"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Fecha y Hora"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Fecha Completada:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Progreso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Fecha de Ini_cio:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Resu_men:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Tarea"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
 msgid "_Contacts..."
 msgstr "_Contactos..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Hora de _fin:"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Hora de _inicio:"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+msgid "Custom recurrence"
+msgstr "Recurrencia personalizada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "Every"
+msgstr "Cada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Modify"
+msgstr "Modificar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "No recurrence"
+msgstr "Sin recurrencia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+msgid "Preview"
+msgstr "Vista previa"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "Recurrence Rule"
+msgstr "Regla de recurrencia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
+msgid "Simple recurrence"
+msgstr "Recurrencia simple"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "para"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "siempre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mes(es)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "hasta"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "semana(s)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "año(s)"
+
+#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1975
+#: calendar/gui/print.c:1977 calendar/gui/print.c:1978
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:544
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
+
+#: calendar/gui/dialogs/recurrence-page.c:887
+msgid "on"
+msgstr "en"
+
+#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
+msgid "day"
+msgstr "día"
+
+#: calendar/gui/dialogs/recurrence-page.c:1043
+msgid "on the"
+msgstr "en el"
+
+#: calendar/gui/dialogs/recurrence-page.c:1051
+msgid "th"
+msgstr "º"
+
+#: calendar/gui/dialogs/recurrence-page.c:1215
+msgid "occurrences"
+msgstr "ocurrencias"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "¿Desea guardar los cambios?"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Fecha Completada:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:110
+msgid "Task"
+msgstr "Tarea"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_leto:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Progreso"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Fecha de Ini_cio:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
 msgid "_Due Date:"
 msgstr "Fecha _de Fin:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-page.glade.h:22
 msgid "_Priority:"
 msgstr "_Prioridad:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-page.glade.h:23
 msgid "_Status:"
 msgstr "E_stado:"
 
@@ -2334,99 +2568,99 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:705
+#: calendar/gui/e-calendar-table.c:737
 msgid "Edit this task"
 msgstr "Editar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:707
+#: calendar/gui/e-calendar-table.c:739
 msgid "Mark as complete"
 msgstr "Marcar como completa"
 
-#: calendar/gui/e-calendar-table.c:708
+#: calendar/gui/e-calendar-table.c:740
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Borrar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:713
+#: calendar/gui/e-calendar-table.c:745
 msgid "Mark tasks as complete"
 msgstr "Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:714
+#: calendar/gui/e-calendar-table.c:746 ui/evolution-tasks.xml.h:4
 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
-#: calendar/gui/print.c:617
+#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:284
+#: calendar/gui/print.c:782
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
+#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:287
+#: calendar/gui/print.c:784
 msgid "pm"
 msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1275
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1599
 msgid "%A %d %B"
 msgstr "%A %b de %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1289
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1302
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3129 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3279
+#: calendar/gui/e-day-view.c:3131 calendar/gui/e-week-view.c:2968
 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:3284
+#: calendar/gui/e-day-view.c:3136 calendar/gui/e-week-view.c:2973
 msgid "Go to Today"
 msgstr "Ir a hoy"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3286
+#: calendar/gui/e-day-view.c:3138 calendar/gui/e-week-view.c:2975
 msgid "Go to Date..."
 msgstr "Ir a una fecha..."
 
-#: 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
+#: calendar/gui/e-day-view.c:3145 calendar/gui/e-week-view.c:2981
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "Abrir"
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3294
+#: calendar/gui/e-day-view.c:3147 calendar/gui/e-week-view.c:2983
 msgid "Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3296
+#: calendar/gui/e-day-view.c:3149 calendar/gui/e-week-view.c:2985
 #: 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:3309
+#: calendar/gui/e-day-view.c:3158 calendar/gui/e-week-view.c:2998
 msgid "Make this Occurrence Movable"
 msgstr "Hacer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3311
+#: calendar/gui/e-day-view.c:3160 calendar/gui/e-week-view.c:3000
 msgid "Delete this Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/e-day-view.c:3162
 msgid "Delete all Occurrences"
 msgstr "Borrar todas las Ocurrencias"
 
@@ -2435,71 +2669,71 @@ msgstr "Borrar todas las Ocurrencias"
 msgid "%02i minute divisions"
 msgstr "%02i divisiónes por minuto"
 
-#: calendar/gui/e-itip-control.c:161
+#: calendar/gui/e-itip-control.c:163
 msgid "I couldn't update your calendar file!\n"
 msgstr "¡No pude actualizar el archivo de su calendario!\n"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
+#: calendar/gui/e-itip-control.c:169 calendar/gui/e-itip-control.c:512
 msgid "Component successfully updated."
 msgstr "Componente actualizado satisfactoriamente."
 
-#: calendar/gui/e-itip-control.c:173
+#: calendar/gui/e-itip-control.c:175
 msgid "There was an error loading the calendar file."
 msgstr "Hubo un error cargando al archivo del calendario."
 
-#: calendar/gui/e-itip-control.c:197
+#: calendar/gui/e-itip-control.c:199
 msgid "I couldn't open your calendar file!\n"
 msgstr "¡No pude abrir el archivo de su calendario!\n"
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
+#: calendar/gui/e-itip-control.c:460 calendar/gui/e-itip-control.c:531
 msgid "I couldn't load your calendar file!\n"
 msgstr "¡No pude cargar el archivo de su calendario!\n"
 
-#: calendar/gui/e-itip-control.c:470
+#: calendar/gui/e-itip-control.c:472
 msgid "I couldn't read your calendar file!\n"
 msgstr "¡No pude leer el archivo de su calendario!\n"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:485
 msgid "This is a reply from someone who was uninvited!"
 msgstr "¡Esta es una respuesta de alguien que no estaba invitado!"
 
-#: calendar/gui/e-itip-control.c:499
+#: calendar/gui/e-itip-control.c:501
 msgid "I couldn't update your calendar store."
 msgstr "No pude actualizar el alamacen de su calendario."
 
-#: calendar/gui/e-itip-control.c:540
+#: calendar/gui/e-itip-control.c:542
 msgid "I couldn't delete the calendar component!\n"
 msgstr "¡No pude borrar el componente del calendario!\n"
 
-#: calendar/gui/e-itip-control.c:550
+#: calendar/gui/e-itip-control.c:552
 msgid "Component successfully deleted."
 msgstr "Componente borrado satisfactoriamente."
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/e-itip-control.c:696
 msgid "I don't recognize this type of calendar component."
 msgstr "No reconozco este tipo de componente de calendario."
 
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:782
 msgid "Add to Calendar"
 msgstr "Añadir al calendario"
 
-#: calendar/gui/e-itip-control.c:814
+#: calendar/gui/e-itip-control.c:816
 msgid " Accept "
 msgstr "Aceptar "
 
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:817
 msgid " Decline "
 msgstr "Declinar "
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:818
 msgid " Tentative "
 msgstr "Tentativa "
 
-#: calendar/gui/e-itip-control.c:860
+#: calendar/gui/e-itip-control.c:862
 msgid "Update Calendar"
 msgstr "Actualizar calendario"
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/e-itip-control.c:885
 msgid "Cancel Meeting"
 msgstr "Cancelar encuentro"
 
@@ -2532,10 +2766,6 @@ msgstr "Organizador:"
 msgid "Server Message:"
 msgstr "Mensaje del Servidor:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Resumen:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "fecha de fin"
@@ -2621,276 +2851,40 @@ msgstr ""
 "Hora"
 
 #: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1081
 msgid "Status"
 msgstr "Estado"
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:181 calendar/gui/e-tasks.c:525
+#: calendar/gui/e-tasks.c:558
 msgid "All"
 msgstr "Todo"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:187
 msgid "Category:"
 msgstr "Categorías:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:333
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No puedo cargar las tareas en `%s'"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:345
 #, c-format
 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:377
-msgid "Edit Appointment"
-msgstr "Editar Cita"
-
-#: calendar/gui/event-editor.c:449
-msgid "on"
-msgstr "en"
-
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
-msgid "day"
-msgstr "día"
-
-#: calendar/gui/event-editor.c:601
-msgid "on the"
-msgstr "en el"
-
-#: calendar/gui/event-editor.c:608
-msgid "th"
-msgstr "º"
-
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
-msgstr "ocurrencias"
-
-#: 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:1543
-#, c-format
-msgid " %d days"
-msgstr "%d días"
-
-#: calendar/gui/event-editor.c:1545
-msgid " 1 day"
-msgstr " 1 día"
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d weeks"
-msgstr " %d semanas"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 week"
-msgstr " 1 semana"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d hours"
-msgstr " %d horas"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 hour"
-msgstr " 1 hora"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d minutes"
-msgstr " %d minutos"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 minute"
-msgstr "1 minuto"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d seconds"
-msgstr " %d segundos"
-
-#: 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:1588
-msgid "Play a sound"
-msgstr "Tocar un sonido"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: 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:1594
-msgid "Send an email"
-msgstr "Enviar un correo"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1597
-msgid "Run a program"
-msgstr "Ejecutar un programa"
-
-#: calendar/gui/event-editor.c:1612
-msgid " before start of appointment"
-msgstr "antes del inicio de la cita"
-
-#: calendar/gui/event-editor.c:1614
-msgid " after start of appointment"
-msgstr "tras el inicio de la cita"
-
-#: calendar/gui/event-editor.c:1622
-msgid " before end of appointment"
-msgstr "antes del fin de la cita"
-
-#: calendar/gui/event-editor.c:1624
-msgid " after end of appointment"
-msgstr "tras el fin de la cita"
-
-#: 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"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Evento para todo e_l día"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Bases de la citas"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Recurrencia personalizada"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Cada"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Excepciones"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modificar"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Sin recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Vista previa"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regla de recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Configuración..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Recurrencia simple"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Hora de _fin:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Hora de _inicio:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Fecha de Ini_cio:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "después de"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "antes"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "día(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "fin de la cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "para"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "siempre"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "hora(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:87
-msgid "minute(s)"
-msgstr "minuto(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mes(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "comienzo de cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "hasta"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "semana(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "año(s)"
-
-#: calendar/gui/e-week-view.c:3277 calendar/gui/e-week-view.c:3300
+#: calendar/gui/e-week-view.c:2966 calendar/gui/e-week-view.c:2989
 msgid "New Appointment..."
 msgstr "Nueva Cita..."
 
-#: calendar/gui/e-week-view.c:3313
+#: calendar/gui/e-week-view.c:3002
 msgid "Delete All Occurrences"
 msgstr "Borrar todas las Ocurrencias"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1583
 msgid "%d %B"
 msgstr "%d de %B"
 
@@ -3008,196 +3002,196 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:448
 msgid "1st"
 msgstr "1º"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:448
 msgid "2nd"
 msgstr "2º"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:448
 msgid "3rd"
 msgstr "3º"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:448
 msgid "4th"
 msgstr "4º"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:448
 msgid "5th"
 msgstr "5º"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:449
 msgid "6th"
 msgstr "6º"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:449
 msgid "7th"
 msgstr "7º"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:449
 msgid "8th"
 msgstr "8º"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:449
 msgid "9th"
 msgstr "9º"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:449
 msgid "10th"
 msgstr "10º"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:450
 msgid "11th"
 msgstr "11º"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:450
 msgid "12th"
 msgstr "12º"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:450
 msgid "13th"
 msgstr "13º"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:450
 msgid "14th"
 msgstr "14º"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:450
 msgid "15th"
 msgstr "15º"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:451
 msgid "16th"
 msgstr "16º"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:451
 msgid "17th"
 msgstr "17º"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:451
 msgid "18th"
 msgstr "18º"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:451
 msgid "19th"
 msgstr "19º"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:451
 msgid "20th"
 msgstr "20º"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:452
 msgid "21st"
 msgstr "21º"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:452
 msgid "22nd"
 msgstr "22º"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:452
 msgid "23rd"
 msgstr "23º"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:452
 msgid "24th"
 msgstr "24º"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:452
 msgid "25th"
 msgstr "25º"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:453
 msgid "26th"
 msgstr "26º"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:453
 msgid "27th"
 msgstr "27º"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:453
 msgid "28th"
 msgstr "28º"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:453
 msgid "29th"
 msgstr "29º"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:453
 msgid "30th"
 msgstr "30º"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:454
 msgid "31st"
 msgstr "31º"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:513
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:513
 msgid "Mo"
 msgstr "Lun"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:513
 msgid "Tu"
 msgstr "Mar"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:513
 msgid "We"
 msgstr "Mier"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:514
 msgid "Th"
 msgstr "Jue"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:514
 msgid "Fr"
 msgstr "Vier"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:514
 msgid "Sa"
 msgstr "Sab"
 
 #. Day
-#: calendar/gui/print.c:1078
+#: calendar/gui/print.c:1951
 msgid "Current day (%a %b %d %Y)"
 msgstr "Día actual (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1970 calendar/gui/print.c:1974
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1971
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1982
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Semana actual (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1990
 msgid "Current month (%b %Y)"
 msgstr "Mes actual (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
+#: calendar/gui/print.c:1997
 msgid "Current year (%Y)"
 msgstr "Año actual (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2212
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1447
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2299 mail/mail-callbacks.c:1487
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/tasks-control.c:112
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrará la carpeta de tareas"
 
@@ -3356,7 +3350,7 @@ msgstr "La encriptación no está soportada por este cifrado"
 msgid "Decryption is not supported by this cipher"
 msgstr "La desencriptación no está soportada por este cifrado"
 
-#: camel/camel-disco-store.c:271
+#: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en línea para competar esta operación"
 
@@ -3377,7 +3371,7 @@ msgstr "No pude procesar la carpeta temporal"
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:680
 #, c-format
 msgid "Failed message %d"
 msgstr "Error en el mensaje %d"
@@ -3386,30 +3380,30 @@ msgstr "Error en el mensaje %d"
 msgid "Cannot open message"
 msgstr "No puedo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:691 camel/camel-filter-driver.c:801
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:806
 msgid "Complete"
 msgstr "Completo"
 
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:761
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:766 camel/camel-filter-driver.c:784
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:883
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parseando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:888
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
@@ -3624,7 +3618,7 @@ msgstr "(servidor desconocido)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
@@ -3739,7 +3733,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:433
+#: camel/providers/imap/camel-imap-store.c:442
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autentificación errónea desde el servidor."
 
@@ -3817,64 +3811,46 @@ msgstr ""
 "No puedo crear el directorio %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:194
+#: camel/camel-smime-context.c:173
 #, 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:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr "Por favor indique el apodo de un certificado con el que firmar."
 
-#: camel/camel-smime-context.c:327
+#: camel/camel-smime-context.c:209
 #, 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."
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "El certificado de firma para \"%s\" no existe."
 
-#: 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:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "El certificado de encriptación \"%s\" no existe."
 
-#: camel/camel-smime-context.c:570
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
 #, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "No pude encriptar: clave de usuario invalida: \"%s\"."
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Error al buscar el certificado para \"%s\"."
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr "Error al buscar un algoritmo de volumen común."
 
-#: 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:799
+msgid "Failed to decode message."
+msgstr "Error al docodificar el mensaje."
 
-#: camel/camel-smime-context.c:626
-msgid "Failed to decrypt: Unknown"
-msgstr "Fallo al desencriptar: Desconocido"
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr "Error al verificar el certificado."
 
 #. 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
+#: camel/camel-store.c:378 mail/mail-ops.c:1017 mail/mail-ops.c:1024
+#: mail/mail-ops.c:1042 mail/mail-ops.c:1043
 msgid "Trash"
 msgstr "Papelera"
 
@@ -3946,59 +3922,63 @@ msgstr "No puede copiar mensajes de esta papelera."
 msgid "Could not open cache directory: %s"
 msgstr "No puedo abrir directorio de cache: %s"
 
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Respuesta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "La respuesta del servidor terminó demasiado pronto."
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:489
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La respuesta del servidor IMAP no contenía información de %s"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:526
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente a respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:188
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:207
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:364
+#: camel/providers/imap/camel-imap-folder.c:267
+msgid "Folder was destroyed and recreated on server."
+msgstr "La carpeta fue destruida y recreada en el servidor."
+
+#: camel/providers/imap/camel-imap-folder.c:415
 msgid "Scanning IMAP folder"
 msgstr "Escaneando carpeta IMAP"
 
-#: camel/providers/imap/camel-imap-folder.c:1047
-#: camel/providers/imap/camel-imap-folder.c:1281
+#: camel/providers/imap/camel-imap-folder.c:1437
+#: camel/providers/imap/camel-imap-folder.c:1673
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:1075
-#: camel/providers/imap/camel-imap-folder.c:1314
+#: camel/providers/imap/camel-imap-folder.c:1465
+#: camel/providers/imap/camel-imap-folder.c:1706
 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:13
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
 msgid "Checking for new mail"
 msgstr "Comprobando si hay correo nuevo"
 
@@ -4006,7 +3986,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:598
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:599
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -4038,28 +4018,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:456
+#: camel/providers/imap/camel-imap-store.c:465
 #, 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:466
+#: camel/providers/imap/camel-imap-store.c:475
 #: 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:490
+#: camel/providers/imap/camel-imap-store.c:499
 #, 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:505
+#: camel/providers/imap/camel-imap-store.c:514
 #: 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:531
+#: camel/providers/imap/camel-imap-store.c:540
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4070,7 +4050,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
+#: camel/providers/imap/camel-imap-store.c:829 mail/mail-local.c:333
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
@@ -4143,20 +4123,18 @@ msgstr "No pude borrar el índice de la carpeta `%s': %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No pude añadir mensajes al resumen: razón desconocida"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No pude añadir el mensaje a la carpeta tipo maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4165,15 +4143,15 @@ msgstr ""
 "No puedo obtener el mensaje; %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
 msgid "No such message"
 msgstr "No existe ese mensaje"
 
 #
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Contenido inválido en el mensaje"
 
@@ -4241,9 +4219,9 @@ msgstr "No puedo abrir el buzón: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No puedo añadir el mensaje al archivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4252,11 +4230,11 @@ msgstr ""
 "No puedo obtener el mensaje; %s de la carpeta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La carpeta parece estar corrompida e irrecuperable."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallo la construcción del mensaje: ¿Buzón corrompido?"
 
@@ -4321,7 +4299,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "No puedo resumir la carpeta: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1598
 msgid "Synchronising folder"
 msgstr "Sincronizando carpeta"
 
@@ -4374,8 +4352,7 @@ msgstr "No pude cambiar el nombre a la carpeta: %s"
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No pude añadir el mensaje a la carpeta mh: %s: %s"
@@ -4505,7 +4482,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:51
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:58
 msgid "POP"
 msgstr "POP"
 
@@ -4598,7 +4575,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:67
+#: mail/mail-config.glade.h:77
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4651,7 +4628,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:62
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:70
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4901,54 +4878,53 @@ msgstr "Expiró el tiempo para QUIT: %s: no es fatal"
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Respuesta de error a QUIT: %s: no es fatal"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:122
+#: composer/e-msg-composer-attachment-bar.c:336 mail/mail-display.c:123
 msgid "attachment"
 msgstr "adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:421
+#: composer/e-msg-composer-attachment-bar.c:426
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Adjuntar un fichero"
 
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:474
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar los elementos seleccionados de la lista de adjuntos"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:505
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:506
 msgid "Attach a file to the message"
 msgstr "Adjuntar un fichero al mensaje"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
-#: mail/message-list.c:1081
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:11
 msgid "Attachment"
 msgstr "Adjunto"
 
@@ -4972,28 +4948,7 @@ msgstr "Tipo MIME:"
 msgid "Send as:"
 msgstr "Enviar como:"
 
-#: 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
+#: composer/e-msg-composer.c:620
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -5002,21 +4957,21 @@ msgstr ""
 "No pude abrir el archivo de firma %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:793
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:785
+#: composer/e-msg-composer.c:804
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:824
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:877
+#: composer/e-msg-composer.c:896
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5024,12 +4979,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:935 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:958 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:228
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:941
+#: composer/e-msg-composer.c:964
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5039,27 +4994,27 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:989
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1092
+#: composer/e-msg-composer.c:1145
 msgid "That file does not exist."
 msgstr "Ese archivo no existe."
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1155
 msgid "That is not a regular file."
 msgstr "Ese no es un archivo normal."
 
-#: composer/e-msg-composer.c:1112
+#: composer/e-msg-composer.c:1165
 msgid "That file exists but is not readable."
 msgstr "Ese archivo no es legible."
 
-#: composer/e-msg-composer.c:1122
+#: composer/e-msg-composer.c:1175
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Ese archivo parece accesible pero open(2) ha fallado."
 
-#: composer/e-msg-composer.c:1144
+#: composer/e-msg-composer.c:1197
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -5067,15 +5022,15 @@ msgstr ""
 "El archivo es muy largo (más de 100K).\n"
 "¿Esta seguro que quiere añadirlo?"
 
-#: composer/e-msg-composer.c:1165
+#: composer/e-msg-composer.c:1218
 msgid "An error occurred while reading the file."
 msgstr "Ha ocurrido un error mientras se leía el archivo."
 
-#: composer/e-msg-composer.c:1526 composer/e-msg-composer.c:1871
+#: composer/e-msg-composer.c:1581 composer/e-msg-composer.c:1926
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:1962
+#: composer/e-msg-composer.c:2017
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
@@ -5269,63 +5224,67 @@ msgstr ""
 "\n"
 "Déjelo vacío para la elección por defecto"
 
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
+#: executive-summary/component/e-summary-url.c:70
+#: executive-summary/component/e-summary-url.c:75
+#: executive-summary/component/e-summary-url.c:82
 #, c-format
 msgid "Open %s with the default GNOME application"
 msgstr "Abrir %s con la aplicación por defecto de GNOME"
 
-#: executive-summary/component/e-summary-url.c:70
+#: executive-summary/component/e-summary-url.c:71
 #, c-format
 msgid "Open %s with the default GNOME web browser"
 msgstr "Abrir %s con el navegador web por defecto de GNOME"
 
-#: executive-summary/component/e-summary-url.c:71
+#: executive-summary/component/e-summary-url.c:72
 #, c-format
 msgid "Send an email to %s"
 msgstr "Enviar un correo a %s"
 
-#: executive-summary/component/e-summary-url.c:72
+#: executive-summary/component/e-summary-url.c:73
 #, c-format
 msgid "Change the view to %s"
 msgstr "Cambiar la vista a %s"
 
-#: executive-summary/component/e-summary-url.c:73
+#: executive-summary/component/e-summary-url.c:74
 #, c-format
 msgid "Run %s"
 msgstr "Ejecutar %s"
 
-#: executive-summary/component/e-summary-url.c:75
+#: executive-summary/component/e-summary-url.c:76
 #, c-format
 msgid "Close %s"
 msgstr "Cerrar %s"
 
-#: executive-summary/component/e-summary-url.c:76
+#: executive-summary/component/e-summary-url.c:77
 #, c-format
 msgid "Move %s to the left"
 msgstr "Mover %s a la izquierda"
 
-#: executive-summary/component/e-summary-url.c:77
+#: executive-summary/component/e-summary-url.c:78
 #, c-format
 msgid "Move %s to the right"
 msgstr "Mover %s a la derecha"
 
-#: executive-summary/component/e-summary-url.c:78
+#: executive-summary/component/e-summary-url.c:79
 #, c-format
 msgid "Move %s into the previous row"
 msgstr "Mover %s a la fila anterior"
 
-#: executive-summary/component/e-summary-url.c:79
+#: executive-summary/component/e-summary-url.c:80
 #, c-format
 msgid "Move %s into the next row"
 msgstr "Mover %s a la fila siguiente"
 
-#: executive-summary/component/e-summary-url.c:80
+#: executive-summary/component/e-summary-url.c:81
 #, c-format
 msgid "Configure %s"
 msgstr "Configurar %s"
 
+#: executive-summary/component/e-summary-url.c:554
+msgid "page"
+msgstr "pagina"
+
 #: executive-summary/component/executive-summary-config.glade.h:1
 msgid "Appearance"
 msgstr "Apariencia"
@@ -5532,7 +5491,7 @@ msgstr ""
 "Por favor vuelve y especifica una carpeta válida donde entregar el correo."
 
 #: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: mail/mail-account-gui.c:687
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -5782,7 +5741,6 @@ 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:1081
 msgid "Score"
 msgstr "Puntuación"
 
@@ -5814,7 +5772,7 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:767 mail/message-list.c:1082
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:774
 msgid "Subject"
 msgstr "Asunto"
 
@@ -5844,7 +5802,8 @@ msgstr "Reglas de puntuación"
 
 #: 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
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:190
 msgid "Import"
 msgstr "Importar"
 
@@ -5859,6 +5818,7 @@ 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
+#: shell/importer/intelligent.c:195
 msgid "Don't ask me again"
 msgstr "No me preguntes más veces"
 
@@ -5890,7 +5850,7 @@ msgstr ""
 msgid "Settings"
 msgstr "Configuración"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1359
+#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1399
 msgid "Filters"
 msgstr "Filtros"
 
@@ -5918,97 +5878,97 @@ msgstr ""
 msgid "Pine mail"
 msgstr "Correo de Pine"
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:401
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:410
+#: mail/component-factory.c:527
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser.c:329
+#: mail/folder-browser.c:339
 msgid "Store search as vFolder"
 msgstr "Guardar la búsqueda como una carpeta virtual"
 
-#: mail/folder-browser.c:653
+#: mail/folder-browser.c:663
 msgid "VFolder on _Subject"
 msgstr "VFolder según el a_sunto"
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:666
 msgid "VFolder on Se_nder"
 msgstr "VFolder según el _remitente"
 
-#: mail/folder-browser.c:659
+#: mail/folder-browser.c:669
 msgid "VFolder on _Recipients"
 msgstr "VFolder según los _destinatarios"
 
-#: mail/folder-browser.c:662
+#: mail/folder-browser.c:672
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual según la _Lista de Correo"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:678
 msgid "Filter on Sub_ject"
 msgstr "Filtrar según el As_unto"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:681
 msgid "Filter on Sen_der"
 msgstr "Filtrar según el Re_mitente"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:684
 msgid "Filter on Re_cipients"
 msgstr "Filtrar según los Des_tinatarios"
 
-#: mail/folder-browser.c:677
+#: mail/folder-browser.c:687
 msgid "Filter on _Mailing List"
 msgstr "Filtrar según la Lista de _Correo"
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:696
 msgid "_Open"
 msgstr "_Abrir"
 
-#: mail/folder-browser.c:688
+#: mail/folder-browser.c:698
 msgid "Resend"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:690 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:118 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:700 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:123 ui/evolution-tasks.xml.h:11
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: 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
+#: mail/folder-browser.c:702 ui/evolution-event-editor.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:10
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:697 ui/evolution-mail.xml.h:117
+#: mail/folder-browser.c:707 ui/evolution-mail.xml.h:122
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:699 ui/evolution-mail.xml.h:72
+#: mail/folder-browser.c:709 ui/evolution-mail.xml.h:77
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:701
+#: mail/folder-browser.c:711
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:714
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: mail/folder-browser.c:706
+#: mail/folder-browser.c:716
 msgid "Mark as U_nread"
 msgstr "Marcar como _no leído"
 
-#: mail/folder-browser.c:711
+#: mail/folder-browser.c:721
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:713
+#: mail/folder-browser.c:723
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:717 ui/evolution-mail.xml.h:121
+#: mail/folder-browser.c:727 ui/evolution-mail.xml.h:126
 msgid "_Undelete"
 msgstr "_Recuperar"
 
@@ -6016,38 +5976,38 @@ msgstr "_Recuperar"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:727
+#: mail/folder-browser.c:737
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:731
+#: mail/folder-browser.c:741
 msgid "Create Ru_le From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:870
+#: mail/folder-browser.c:880
 msgid "Filter on Mailing List"
 msgstr "Filtrar según la lista de correo"
 
-#: mail/folder-browser.c:871
+#: mail/folder-browser.c:881
 msgid "VFolder on Mailing List"
 msgstr "Carpeta virtual según la Lista de Correo"
 
-#: mail/folder-browser.c:873
+#: mail/folder-browser.c:883
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar según la lista de correo (%s)"
 
-#: mail/folder-browser.c:874
+#: mail/folder-browser.c:884
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Carpeta virtual según la Lista de Correo (%s)"
 
-#: mail/folder-browser-factory.c:196
+#: mail/folder-browser-factory.c:210
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para \"%s\""
 
-#: mail/folder-browser-factory.c:198 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:212 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Propiedades"
@@ -6144,32 +6104,32 @@ msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor.c:154
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-accounts.c:124 mail/mail-accounts.c:175
 msgid " (default)"
 msgstr "(valores predeterminados)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:207
 msgid "Disable"
 msgstr "Deshabilitado"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
+#: mail/mail-accounts.c:209 mail/mail-config.glade.h:35
 msgid "Enable"
 msgstr "Habilitado"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:297 mail/mail-accounts.c:301
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Esta seguro que quiere borrar esta cuenta?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:435 mail/mail-accounts.c:439
 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:568
+#: mail/mail-accounts.c:597
 msgid "Evolution Account Manager"
 msgstr "Administrador de cuentas de Evolution"
 
@@ -6245,29 +6205,29 @@ msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 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:594
+#: mail/mail-callbacks.c:603
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "El día %s, %s escribió:"
 
-#: mail/mail-callbacks.c:756
+#: mail/mail-callbacks.c:769
 msgid "Forwarded message:\n"
 msgstr "Mensaje reenviado:\n"
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:863
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:852
+#: mail/mail-callbacks.c:865
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:1017
+#: mail/mail-callbacks.c:1031
 #, 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:1039
+#: mail/mail-callbacks.c:1053
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6275,7 +6235,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:1073
+#: mail/mail-callbacks.c:1087
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6283,20 +6243,20 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:1085
+#: mail/mail-callbacks.c:1099
 #, 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
+#: mail/mail-callbacks.c:1120
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:1140 mail/mail-display.c:92
+#: mail/mail-callbacks.c:1154 mail/mail-display.c:93
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:1144 mail/mail-display.c:96
+#: mail/mail-callbacks.c:1158 mail/mail-display.c:97
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -6304,15 +6264,15 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Sobreescribirlo?"
 
-#: mail/mail-callbacks.c:1188
+#: mail/mail-callbacks.c:1202
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:1190
+#: mail/mail-callbacks.c:1204
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1389
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6321,20 +6281,20 @@ msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1407
+#: mail/mail-callbacks.c:1447
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:1454
+#: mail/mail-callbacks.c:1494
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresión del mensaje"
 
-#: mail/mail-callbacks.c:1549
+#: mail/mail-callbacks.c:1589
 #, 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:1213 mail/mail-config.c:1216
+#: mail/mail-config.c:1321 mail/mail-config.c:1324
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -6412,26 +6372,38 @@ msgid "Accounts"
 msgstr "Cuentas"
 
 #: mail/mail-config.glade.h:8
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr "Siempre encriptarme a mi mismo cuando envie correo cifrado"
+
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr "Siempre encriptarme a mi mismo cuando envie correo cifrado"
+
+#: mail/mail-config.glade.h:10
 msgid "Always load images off the net"
 msgstr "Cargar imagenes fuera de la red"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Autentificación"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Tipo de autentificación: "
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "Automatically check for new mail every"
 msgstr "Comprobar el correo automáticamente cada"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
+msgid "Certificate ID:"
+msgstr "ID del certificado:"
+
+#: mail/mail-config.glade.h:17
 msgid "Composer"
 msgstr "Nuevo"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:18
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6447,191 +6419,215 @@ msgstr ""
 "\n"
 "Pulse \"Finalizar\" para guardar su configuración."
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:24
 msgid "De_fault"
 msgstr "Va_lores predeterminados"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "Default \"Forward\" style is: "
 msgstr "El estilo por defecto de \"Reenviar\" es: "
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
+msgid "Default character set: "
+msgstr "Juego de caracteres por defecto: "
+
+#: mail/mail-config.glade.h:28
+msgid "Digital IDs..."
+msgstr "ID digitales..."
+
+#: mail/mail-config.glade.h:30
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:31
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:32
 msgid "Drafts folder:"
 msgstr "Carpeta de borradores:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:34
 msgid "Email Address:"
 msgstr "Dirección de correo:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:36
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:37
+msgid "Get Digital ID..."
+msgstr "Obtener ID digital..."
+
+#: mail/mail-config.glade.h:38
 msgid "Highlight citations with"
 msgstr "Resaltadar citas con"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:40
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:41
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:42
 msgid "In HTML mail"
 msgstr "Correo en HTML"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:43
 msgid "Inline"
 msgstr "Incluido en línea"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:44
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:45
 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
+#: mail/mail-config.glade.h:46
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:47
 msgid "Make this my default account"
 msgstr "Hacer de esta mi cuenta predeterminada"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:48
 msgid "Mark messages as \"Read\" after:"
 msgstr "Marcar mensajes como \"Leídos\" tras:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:50
 msgid "Never load images off the net"
 msgstr "No cargar nunca imágenes desde la red"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:51
 msgid "News"
 msgstr "Noticias"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:53
 msgid "Optional Information"
 msgstr "Información Opcional"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:54
 msgid "Organization:"
 msgstr "Organización:"
 
-#: mail/mail-config.glade.h:49
-msgid "PGP"
-msgstr "PGP"
+#: mail/mail-config.glade.h:56
+msgid "PGP Key ID:"
+msgstr "ID de la clave PGP:"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:57
 msgid "PGP binary path:"
 msgstr "Localización del binario de PGP:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:62
+msgid "Pretty Good Privacy"
+msgstr "Pretty Good Privacy"
+
+#: mail/mail-config.glade.h:63
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:64
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:65
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:66
 msgid "Receiving Mail"
 msgstr "Recibiendo Mensajes"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:67
 msgid "Receiving Options"
 msgstr "Recibiendo Opciones"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:69
 msgid "Required Information"
 msgstr "Información Requerida"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:71
+msgid "Secure MIME"
+msgstr "MIME seguro"
+
+#: mail/mail-config.glade.h:72
+msgid "Security"
+msgstr "Seguridad"
+
+#: mail/mail-config.glade.h:73
 msgid "Select PGP binary"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:74
 msgid "Send mail in HTML format by default."
 msgstr "Enviar por defecto el mensaje en formato HTML"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:75
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:76
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:78
 msgid "Sent"
 msgstr "Enviado"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:80
 msgid "Sent messages folder:"
 msgstr "Carpeta de mensajes enviados:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:81
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:82
 msgid "Server Type: "
 msgstr "Tipo de servidor:"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:83
 msgid "Server requires authentication"
 msgstr "El servidor requiere autentificación"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:84
 msgid "Signature file:"
 msgstr "Archivo de firma:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:85
 msgid "Sources"
 msgstr "Fuentes"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:86
 msgid "Special Folders"
 msgstr "Carpetas Especiales"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:87
 msgid "Standard Unix mbox"
 msgstr "Mabox estándar de Unix"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:88
 msgid "Type"
 msgstr "Tipo"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:89
 msgid "Use secure connection (SSL)"
 msgstr "Use conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:90
 msgid "Username:"
 msgstr "Nombre:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:91
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6641,12 +6637,16 @@ msgstr ""
 "\n"
 "Pulse \"Siguiente\" para comenzar. "
 
-#: 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
+#: mail/mail-config.glade.h:96 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:47 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-config.glade.h:98
+msgid "placeholder"
+msgstr ""
+
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "No pude crear un contexto de firma PGP."
@@ -6663,189 +6663,193 @@ msgstr "No pude crear un contexto de encriptación PGP."
 msgid "Could not create a PGP decryption context."
 msgstr "No pude crear un contexto de desencriptación PGP."
 
-#: mail/mail-crypto.c:169
+#: mail/mail-crypto.c:173
 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:205
+msgid "Could not create a S/MIME certsonly context."
+msgstr "No pude crear un contexto de certificado S/MIME."
 
-#: mail/mail-crypto.c:225
+#: mail/mail-crypto.c:236
 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-crypto.c:267
+msgid "Could not create a S/MIME envelope context."
+msgstr "No pude crear un contexto sobre tipo S/MIME."
+
+#: mail/mail-crypto.c:297
+msgid "Could not create a S/MIME decode context."
+msgstr "No pude crear un contexto de decodificación S/MIME."
 
-#: mail/mail-display.c:196
+#: mail/mail-display.c:197
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:236
+#: mail/mail-display.c:237
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/mail-display.c:297
+#: mail/mail-display.c:298
 msgid "Save to Disk..."
 msgstr "Guardar en disco..."
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:300
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:301
+#: mail/mail-display.c:302
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:336
+#: mail/mail-display.c:337
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:360
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (vía %s)"
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:364
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:962
+#: mail/mail-display.c:989
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1256
+#: mail/mail-display.c:1283
 msgid "Open link in browser"
 msgstr "Abrir enlaze en el navegador"
 
-#: mail/mail-display.c:1258
+#: mail/mail-display.c:1285
 msgid "Save as (FIXME)"
 msgstr "Guardar como (ARREGLAME)"
 
-#: mail/mail-display.c:1260
+#: mail/mail-display.c:1287
 msgid "Copy location (FIXME)"
 msgstr "Copiar dirección (ARREGLAME)"
 
-#: mail/mail-format.c:527
+#: mail/mail-format.c:532
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:573
+#: mail/mail-format.c:580
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:640 mail/message-list.c:1082
+#: mail/mail-format.c:647
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:756 mail/message-list.c:1082
+#: mail/mail-format.c:763
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:759
+#: mail/mail-format.c:766
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:762 mail/message-list.c:1083
+#: mail/mail-format.c:769
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:772
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1075
+#: mail/mail-format.c:1094
 msgid "No GPG/PGP program configured."
 msgstr "No hay programas GPG/PGP configurados."
 
-#: mail/mail-format.c:1090
+#: mail/mail-format.c:1109
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1115
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:1097
+#: mail/mail-format.c:1116
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1153
+#: mail/mail-format.c:1172
 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:1161
+#: mail/mail-format.c:1180
 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:1787
+#: mail/mail-format.c:1831
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:1843
 #, 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:1803
+#: mail/mail-format.c:1847
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:1837
+#: mail/mail-format.c:1881
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1842
+#: mail/mail-format.c:1886
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:505
+#: mail/mail-local.c:504
 #, c-format
 msgid "Opening '%s'"
 msgstr "Abriendo '%s'"
 
-#: mail/mail-local.c:785
+#: mail/mail-local.c:784
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta \"%s\" al formato \"%s\""
 
-#: mail/mail-local.c:789
+#: mail/mail-local.c:788
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar la carpeta \"%s\" al formato \"%s\""
 
-#: mail/mail-local.c:812
+#: mail/mail-local.c:811
 msgid "Reconfiguring folder"
 msgstr "Reconfigurar carpeta"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:841
+#: mail/mail-local.c:840
 msgid "Closing current folder"
 msgstr "Cerrando carpeta actual"
 
-#: mail/mail-local.c:873
+#: mail/mail-local.c:872
 msgid "Renaming old folder and opening"
 msgstr "Renombrando carpeta antigua y abriéndola"
 
-#: mail/mail-local.c:891
+#: mail/mail-local.c:890
 msgid "Creating new folder"
 msgstr "Creando una nueva carpeta"
 
-#: mail/mail-local.c:905
+#: mail/mail-local.c:904
 msgid "Copying messages"
 msgstr "Copiando mensajes"
 
-#: mail/mail-local.c:922
+#: mail/mail-local.c:921
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6854,7 +6858,7 @@ msgstr ""
 "No puedo guardar la metainformación de la carpeta: probablemente\n"
 "volver a abrir esta carpeta: %s"
 
-#: mail/mail-local.c:961
+#: mail/mail-local.c:960
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6862,6 +6866,11 @@ msgstr ""
 "Si no puede volver a abrir este buzón, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
+#: mail/mail-local.c:1046
+#, c-format
+msgid "Reconfigure %s"
+msgstr "Reconfigurar %s"
+
 #: mail/mail-mt.c:190
 #, c-format
 msgid ""
@@ -6888,93 +6897,112 @@ msgstr "Trabajando"
 msgid "Evolution progress"
 msgstr "Progreso de Evolution"
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:607
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:611
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:726
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:745
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:747 mail/mail-send-recv.c:475
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:833
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:907
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:907
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:923
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:926
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en \"%s\""
 
-#: mail/mail-ops.c:1154
+#: mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1343
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1272
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1411
+#, c-format
+msgid "Removing folder %s"
+msgstr "Eliminando carpeta %s"
+
+#: mail/mail-ops.c:1495
+#, c-format
+msgid "Moving folder %s to %s"
+msgstr "Moviendo la carpeta %s a %s"
+
+#: mail/mail-ops.c:1497
+#, c-format
+msgid "Copying folder %s to %s"
+msgstr "Copiando carpeta %s a %s"
+
+#: mail/mail-ops.c:1650
+msgid "Refreshing folder"
+msgstr "Actualizando carpeta"
+
+#: mail/mail-ops.c:1686
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1735
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1802
 msgid "Retrieving messages"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:1575
+#: mail/mail-ops.c:1812
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Obteniendo mensaje número %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1649
+#: mail/mail-ops.c:1886
 msgid "Saving messages"
 msgstr "Guardando mensajes"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1965
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6983,12 +7011,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
+#: mail/mail-ops.c:1978
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Guardando mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1992
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6997,11 +7025,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2066
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2081
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7010,12 +7038,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2109
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:1939
+#: mail/mail-ops.c:2176
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
@@ -7084,30 +7112,30 @@ msgstr "¡Mensaje escrito incompleto en la tubería!"
 msgid "Mail Summary"
 msgstr "Resumen de Correo"
 
-#: mail/mail-tools.c:145
+#: mail/mail-tools.c:156
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No puedo crear el mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:192
+#: mail/mail-tools.c:203
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaje reenviado)"
 
-#: mail/mail-tools.c:202
+#: mail/mail-tools.c:213
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sin asunto)"
 
-#: mail/mail-tools.c:219
+#: mail/mail-tools.c:230
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:221
+#: mail/mail-tools.c:232
 msgid "Forwarded message (no subject)"
 msgstr "Mensaje reenviado (sin asunto)"
 
-#: mail/mail-tools.c:428
+#: mail/mail-tools.c:439
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
@@ -7126,134 +7154,122 @@ msgstr "Nueva carpeta virtual"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:188 ui/evolution-mail.xml.h:70
+#: mail/message-browser.c:197 ui/evolution-mail.xml.h:75
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-browser.c:188
+#: mail/message-browser.c:197
 msgid "Reply to the sender of this message"
 msgstr "Responder al remitente de este mensaje"
 
-#: mail/message-browser.c:191 ui/evolution-mail.xml.h:71
+#: mail/message-browser.c:200 ui/evolution-mail.xml.h:76
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: mail/message-browser.c:191
+#: mail/message-browser.c:200
 msgid "Reply to all recipients of this message"
 msgstr "Responder a todos los destinatarios de este mensaje"
 
-#: mail/message-browser.c:194 ui/evolution-mail.xml.h:33
+#: mail/message-browser.c:203 ui/evolution-mail.xml.h:38
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/message-browser.c:194
+#: mail/message-browser.c:203
 msgid "Forward this message"
 msgstr "Reenviar este mensaje"
 
-#: mail/message-browser.c:199
+#: mail/message-browser.c:208
 msgid "Print the selected message"
 msgstr "Imprimir el mensaje seleccionado"
 
-#: mail/message-browser.c:202
+#: mail/message-browser.c:211
 msgid "Delete this message"
 msgstr "Borrar este mensaje"
 
-#: 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
+#: mail/message-browser.c:216 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-mail.xml.h:69 ui/evolution-task-editor-dialog.xml.h:36
 msgid "Previous"
 msgstr "Previo"
 
-#: mail/message-browser.c:207
+#: mail/message-browser.c:216
 msgid "Previous message"
 msgstr "Mensaje previo"
 
-#: mail/message-browser.c:210 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:57
+#: mail/message-browser.c:219 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:62
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Siguiente"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:219
 msgid "Next message"
 msgstr "Mensaje siguiente"
 
-#: mail/message-list.c:677
+#: mail/message-list.c:684
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:678
+#: mail/message-list.c:685
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:686
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:687
 msgid "Multiple Unseen Messages"
 msgstr "Multiples mensajes sin leer"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:688
 msgid "Multiple Messages"
 msgstr "Multiples mensajes"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:692
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:693
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:697
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:698
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:948
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:955
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:957
+#: mail/message-list.c:964
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:969
+#: mail/message-list.c:976
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:977
+#: mail/message-list.c:984
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:979
+#: mail/message-list.c:986
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1081
-msgid "Flagged"
-msgstr "Marcado"
-
-#: mail/message-list.c:1082
-msgid "Received"
-msgstr "Recibido"
-
-#: mail/message-list.c:1083
-msgid "Size"
-msgstr "Tamaño"
-
 #: mail/mail-session.c:161
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:48
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -7285,11 +7301,11 @@ msgstr "Dessuscribiendo la carpeta \"%s\""
 msgid "Manage Subscriptions"
 msgstr "Administrar Suscripciones"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: shell/e-setup.c:124 shell/e-setup.c:197
 msgid "Evolution installation"
 msgstr "Instalación de Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7297,31 +7313,31 @@ msgstr ""
 "Esta nueva versión de Evolution necesita instalar archivos adicionales\n"
 "en su carpeta personal de Evolution"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Por favor, pulse en <<Aceptar>> para instalar los archivos, o <<Cancelar>> "
 "para salir."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "No pude actualizar correctamente los archivos"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
+#: shell/e-setup.c:172 shell/e-setup.c:240
 msgid "Evolution files successfully installed."
 msgstr "Los archivos de Evolution han sido instalados."
 
-#: shell/e-setup.c:195
+#: shell/e-setup.c:201
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Parece que esta es la primera vez que ejecuta Evolution"
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:202
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Por favor, pulse en <<Aceptar>> para instalar los archivos de usuario de "
 "Evolution en"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:221
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7332,7 +7348,7 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:230
+#: shell/e-setup.c:236
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -7341,7 +7357,7 @@ msgstr ""
 "No puedo copiar archivos en\n"
 "`%s'."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:303
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7352,7 +7368,21 @@ msgstr ""
 "Por favor, renombre lo para permitir la instalación\n"
 "de los archivos de usuario de Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:317
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+"Evolution ha detectado un antiguo\n"
+"direcotorio de Resumen de Trabajo.\n"
+"Debe ser borrado antes de ejecutar\n"
+"Evolution.\n"
+"¿Quiere que borre ese directorio?"
+
+#: shell/e-setup.c:342
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7363,12 +7393,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:392
+#: shell/e-shell.c:391
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1272
+#: shell/e-shell.c:1256
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7377,21 +7407,21 @@ 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
+#: shell/e-shell-folder-commands.c:239
 #, 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
+#: shell/e-shell-folder-commands.c:244
 msgid "Copy folder"
 msgstr "Copiar una carpeta"
 
-#: shell/e-shell-folder-commands.c:280
+#: shell/e-shell-folder-commands.c:281
 #, 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
+#: shell/e-shell-folder-commands.c:286
 msgid "Move folder"
 msgstr "Mover una carpeta"
 
@@ -7424,7 +7454,7 @@ msgstr ""
 msgid "New..."
 msgstr "Nuevo..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
@@ -7463,7 +7493,7 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:353
+#: shell/e-shell-importer.c:352
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -7472,11 +7502,11 @@ msgstr ""
 "No hay ninguna herramienta para importar datos que pueda encargarse de\n"
 "%s"
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:362
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:371
+#: shell/e-shell-importer.c:370
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -7485,17 +7515,17 @@ msgstr ""
 "Importando %s.\n"
 "Comenzando %s"
 
-#: shell/e-shell-importer.c:384
+#: shell/e-shell-importer.c:383
 #, c-format
 msgid "Error starting %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:404
+#: shell/e-shell-importer.c:402
 #, c-format
 msgid "Error loading %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:419
+#: shell/e-shell-importer.c:417
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -7504,27 +7534,27 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:488
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:538
 msgid "Filename:"
 msgstr "Nombre de fichero:"
 
-#: shell/e-shell-importer.c:545 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
 msgid "Select a file"
 msgstr "Elega un archivo"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:553
 msgid "File type:"
 msgstr "Tipo de archivo:"
 
-#: shell/e-shell-importer.c:601
+#: shell/e-shell-importer.c:599
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: shell/e-shell-importer.c:602
+#: shell/e-shell-importer.c:600
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
@@ -7532,31 +7562,38 @@ msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
-#: shell/e-shell-view.c:166
+#: shell/e-shell-view.c:167
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrándose)"
 
-#: shell/e-shell-view.c:1317
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1384
+msgid "My Evolution"
+msgstr "Mi Evolution"
+
+#: shell/e-shell-view.c:1401
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1319
+#: shell/e-shell-view.c:1403
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1357
+#: shell/e-shell-view.c:1441
 msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution está conectado.  Pulse este botón para trabajar desconectado."
+msgstr ""
+"Evolution está conectado.  Pulse este botón para trabajar desconectado."
 
-#: shell/e-shell-view.c:1364
+#: shell/e-shell-view.c:1448
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1370
+#: shell/e-shell-view.c:1454
 msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution está desconectado.  Pulse este botón para trabajar conectado."
+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."
@@ -7580,23 +7617,23 @@ 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:421
+#: shell/e-shell-view-menu.c:465
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:422
+#: shell/e-shell-view-menu.c:466
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:602
+#: shell/e-shell-view-menu.c:653
 msgid "Work online"
 msgstr "Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:614 shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:665 shell/e-shell-view-menu.c:677
 msgid "Work offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shortcuts.c:381
+#: shell/e-shortcuts.c:382
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
@@ -7759,10 +7796,14 @@ msgstr ""
 "Con este asistente será guiado a traves del proceso de\n"
 "importar archivos externos a Evolution."
 
-#: shell/importer/intelligent.c:186
+#: shell/importer/intelligent.c:187
 msgid "Importers"
 msgstr "Importadores"
 
+#: shell/importer/intelligent.c:193
+msgid "Don't import"
+msgstr "No importar"
+
 #: shell/main.c:82
 #, no-c-format
 msgid ""
@@ -7825,68 +7866,120 @@ msgstr "Enviar la salida de depurado de todos los componente a un archivo."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-event-editor.xml.h:6
+#: ui/evolution-task-editor-dialog.xml.h:7
+msgid "C_ut"
+msgstr "C_ortar"
+
+#: ui/evolution-addressbook.xml.h:2 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"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:15
+msgid "Copy the selection"
+msgstr "Copiar la selección"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Crear nuevo contacto"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Borrar un contacto"
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:15
+#: ui/evolution-task-editor-dialog.xml.h:16
+msgid "Cut"
+msgstr "Cortar"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Buscar"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-event-editor.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:17
+msgid "Cut the selection"
+msgstr "Cortar la selección"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Buscar un contacto"
+#: ui/evolution-addressbook.xml.h:8
+msgid "Delete selected contacts"
+msgstr "Borrar los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
 msgid "New contact"
 msgstr "Nuevo contacto"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:63
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:30
+#: ui/evolution-task-editor-dialog.xml.h:33
+msgid "Paste"
+msgstr "Pegar"
+
+#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:31
+#: ui/evolution-task-editor-dialog.xml.h:34
+msgid "Paste the clipboard"
+msgstr "Pegar el contenido del porta papeles"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:68
 msgid "Previews the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
-msgstr "Imprimir contactos"
+#: ui/evolution-addressbook.xml.h:15
+msgid "Print selected contacts"
+msgstr "Imprimir los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-event-editor.xml.h:48
+#: ui/evolution-task-editor-dialog.xml.h:57
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:49
+#: ui/evolution-task-editor-dialog.xml.h:58
+msgid "Select everything"
+msgstr "Seleccionar todo"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:19
 msgid "Stop Loading"
 msgstr "Parar la carga"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:20
 msgid "View All"
 msgstr "Ver todo"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:21
 msgid "View all contacts"
 msgstr "Ver todos los contactos"
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "Fuentes de la _Agenda..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:24 ui/evolution-event-editor.xml.h:55
+#: ui/evolution-task-editor-dialog.xml.h:67
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: ui/evolution-addressbook.xml.h:25 ui/evolution-event-editor.xml.h:68
+#: ui/evolution-task-editor-dialog.xml.h:81
+msgid "_Paste"
+msgstr "_Pegar"
+
+#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:42
 #: ui/evolution-contact-editor.xml.h:15
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:27
 msgid "_Search for contacts"
 msgstr "Bu_scar contactos"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
+#: ui/evolution-addressbook.xml.h:28 ui/evolution-event-editor.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:86
+msgid "_Select All"
+msgstr "_Seleccionar todo"
+
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:44
 #: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
 #: ui/evolution.xml.h:64
 msgid "_Tools"
@@ -7972,7 +8065,7 @@ msgstr "Imprimir calendario"
 msgid "Print this Calendar"
 msgstr "Imprimir este calendario"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:18
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "Guardar como"
 
@@ -8061,7 +8154,7 @@ msgid "Print..."
 msgstr "Imprimir..."
 
 #: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:20
 #: ui/evolution-task-editor-dialog.xml.h:51
 msgid "Save _As..."
 msgstr "Guardar _como..."
@@ -8089,13 +8182,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:46 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48 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:53
+#: ui/evolution-message-composer.xml.h:55
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Guardar"
@@ -8120,10 +8213,6 @@ msgstr "_Agenda de Direcciones...(FIXME)"
 msgid "C_lear"
 msgstr "_Limpiar"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "C_ortar"
-
 #: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
 msgid "Chec_k Names (FIXME)"
 msgstr "Chec_k Names (FIXME)"
@@ -8144,23 +8233,6 @@ 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:8
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copiar"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copiar la selección"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Cortar"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Cortar la selección"
-
 #: ui/evolution-event-editor.xml.h:18
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
@@ -8205,14 +8277,6 @@ msgstr "Propiedades las propiedades del archivo"
 msgid "N_ext"
 msgstr "Sigui_ente"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Pegar"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Pegar el contenido del porta papeles"
-
 #: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
 msgid "Pre_vious"
 msgstr "Pre_vio"
@@ -8229,7 +8293,7 @@ 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:17
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:18
 #: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
 msgid "Save"
 msgstr "Guardar"
@@ -8238,7 +8302,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:23
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:24
 #: ui/evolution-task-editor-dialog.xml.h:53
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
@@ -8251,14 +8315,6 @@ 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-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Seleccionar todo"
-
 #: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
 msgid "Setup the page settings for your current printer"
 msgstr "Configurar los datos de la página para la impresora actual"
@@ -8271,26 +8327,22 @@ msgstr "Task _Request (FIXME)"
 msgid "_About..."
 msgstr "_Acerca de..."
 
-#: 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
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:44
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "_Cerrar"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:45
 msgid "_Contact (FIXME)"
 msgstr "_Contact (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:44
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:45
 #: 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:48
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:50
 #: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:53
 msgid "_Help"
 msgstr "A_yuda"
@@ -8319,19 +8371,11 @@ msgstr "_Move to Folder... (FIXME)"
 msgid "_Note (FIXME)"
 msgstr "_Note (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:115
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:120
 #: ui/evolution-task-editor-dialog.xml.h:83 ui/evolution.xml.h:60
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-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:63
 msgid "_Task (FIXME)"
@@ -8341,30 +8385,14 @@ 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-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:57
 #: 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"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Añadir un nuevo servicio al Resumen de Trabajo"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Crear un nuevo mensaje electrónico"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Configuración del Resumen de Trabajo..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nuevo"
+msgid "Customise My Evolution"
+msgstr "Personalizar Mi Evolution"
 
 #: ui/evolution-mail.xml.h:1
 msgid "Apply filter rules to the selected messages"
@@ -8447,350 +8475,370 @@ 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 important message"
+msgstr "Mostrar el siguiente mensaje importante"
+
+#: ui/evolution-mail.xml.h:24
 msgid "Display the next message"
 msgstr "Mostrar el mensaje siguiente"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:25
+msgid "Display the next unread message"
+msgstr "Mostrar el siguiente mensaje no leido"
+
+#: ui/evolution-mail.xml.h:26
+msgid "Display the next unread thread"
+msgstr "Mostrar el siguiente hilo no leido"
+
+#: ui/evolution-mail.xml.h:27
+msgid "Display the previous important message"
+msgstr "Mostrar el anterior mensaje importante"
+
+#: ui/evolution-mail.xml.h:28
 msgid "Display the previous message"
 msgstr "Mostrar el mensaje anterior"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
+msgid "Display the previous unread message"
+msgstr "Mostrar el anterior mensaje no leído"
+
+#: ui/evolution-mail.xml.h:30
 msgid "Empty _Trash"
 msgstr "Vaciar _Papelera"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:31
 msgid "Filter on Mailing _List"
 msgstr "Filtrar según la _lista de correo"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:32
 msgid "Filter on Se_nder"
 msgstr "Filtrar según el remite_nte"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:33
 msgid "Filter on _Recipients"
 msgstr "Filtrar según los destinata_rios"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:34
 msgid "Filter on _Subject"
 msgstr "Filtrar según el a_sunto"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:35
 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:31
+#: ui/evolution-mail.xml.h:36
 msgid "Forget _Passwords"
 msgstr "Olvidar _contraseña"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail.xml.h:37
 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
+#: ui/evolution-mail.xml.h:39
 msgid "Forward As"
 msgstr "Reenviar como"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:40
 msgid "Forward _Attached"
 msgstr "Reenviar _Adjunto"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:41
 msgid "Forward _Inline"
 msgstr "Reenviar _dentro del mensaje"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:42
 msgid "Forward _Quoted"
 msgstr "Reenviar _Citado"
 
-#: ui/evolution-mail.xml.h:38
+#: ui/evolution-mail.xml.h:43
 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:39
+#: ui/evolution-mail.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenviar el mensaje seleccionado citado como una respuesta"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Reenviar el mensaje seleccionado a alguien"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:46
 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:42
+#: ui/evolution-mail.xml.h:47
 msgid "Hide S_elected Messages"
 msgstr "Ocultar los mensajes _seleccionados"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "Hide _Deleted Messages"
 msgstr "Ocultar mensajes _borrados"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "Hide _Read messages"
 msgstr "Ocultar mensajes _leídos"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 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:46
+#: ui/evolution-mail.xml.h:51
 msgid "Load _Images"
 msgstr "Cargar _Imágenes"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 msgid "Manage _Subscriptions..."
 msgstr "Administrar _suscripciones..."
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:53
 msgid "Mar_k As Read"
 msgstr "Mar_car como Leído"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "Mark All as R_ead"
 msgstr "Marcar todos como l_eídos"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "Mark As U_nread"
 msgstr "Marcar como _no leído"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "Mark all visible messages as read"
 msgstr "Marcar los mensajes visibles como leídos"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leidos"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:58
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leidos"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:59
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para borrar"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 msgid "Move selected messages to another folder"
 msgstr "Mover mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 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
+#: ui/evolution-mail.xml.h:64
 msgid "Open the selected message in a new window"
 msgstr "Abrir el mensaje seleccionado en una nueva ventana"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abrir el mensaje seleccionado para reenviarlo"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 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
+#: ui/evolution-mail.xml.h:67
 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
+#: ui/evolution-mail.xml.h:71
 msgid "Print Message..."
 msgstr "Imprimir Mensaje..."
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:72
 msgid "Print Preview..."
 msgstr "Vista previa..."
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:73
 msgid "Print message to the printer"
 msgstr "Imprimir el mensaje en la impresora"
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:74
 msgid "Redirect (FIXME: implement me)"
 msgstr "Redirigir (ARREGLAME: implementame)"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:78
 msgid "S_earch Message"
 msgstr "Buscar M_ensaje"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Guardar el mensaje en un archivo de texto"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:80
 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:76 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:81 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:82
 msgid "Select _Thread"
 msgstr "Seleccionar _Hilo"
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail.xml.h:83
 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
+#: ui/evolution-mail.xml.h:84
 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
+#: ui/evolution-mail.xml.h:85
 msgid "Select all visible messages"
 msgstr "Seleccionar todos los mensajes visibles"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail.xml.h:86
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution-mail.xml.h:82
+#: ui/evolution-mail.xml.h:87
 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
+#: ui/evolution-mail.xml.h:88
 msgid "Show Email _Source"
 msgstr "Mostrar la Fuente del Men_saje"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail.xml.h:89
 msgid "Show Full _Headers"
 msgstr "Mostrar cabeceras completas"
 
-#: ui/evolution-mail.xml.h:85
+#: ui/evolution-mail.xml.h:90
 msgid "Show _All"
 msgstr "Mostrar _todo"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail.xml.h:91
 msgid "Show message in the normal style"
 msgstr "Mostrar mensajes en el estilo normal"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail.xml.h:92
 msgid "Show message with all email headers"
 msgstr "Mostrar mensajes con todas las cabeceras"
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail.xml.h:93
 msgid "Show messages that have been temporarily hidden"
 msgstr "Mostrar mensajes que han estado ocultos temporalmente"
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail.xml.h:94
 msgid "Show the raw email source of the message"
 msgstr "Mostrar la fuentes sin formatear del mensaje"
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail.xml.h:95
 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
+#: ui/evolution-mail.xml.h:96
 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
+#: ui/evolution-mail.xml.h:97
 msgid "Temporarily hide the selected messages"
 msgstr "Oculta temporalmente los mensajes seleccionados"
 
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail.xml.h:98
 msgid "Threaded Message list"
 msgstr "Lista de Mensajes Encadenados"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail.xml.h:99
 msgid "Un-delete the selected messages"
 msgstr "Recuperar los mensajes seleccionados"
 
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail.xml.h:100
 msgid "VFolder on Mailing _List..."
 msgstr "Carpeta virtual según la _Lista de Correo..."
 
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail.xml.h:101
 msgid "VFolder on Se_nder..."
 msgstr "VFolder según el Remite_nte..."
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail.xml.h:102
 msgid "VFolder on _Recipients..."
 msgstr "VFolder según los Destinata_rios..."
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail.xml.h:103
 msgid "VFolder on _Subject..."
 msgstr "VFolder según el A_sunto..."
 
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail.xml.h:104
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail.xml.h:105
 msgid "_Apply Filters"
 msgstr "_Aplicar filtro"
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail.xml.h:106
 msgid "_Copy to Folder"
 msgstr "_Copiar a la Carpeta"
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail.xml.h:107
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail.xml.h:104
+#: ui/evolution-mail.xml.h:109
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail.xml.h:110
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail.xml.h:106 ui/evolution.xml.h:50
+#: ui/evolution-mail.xml.h:111 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail.xml.h:112
 msgid "_Forward Message"
 msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail.xml.h:108 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:113 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Invertir selección"
 
-#: ui/evolution-mail.xml.h:109
+#: ui/evolution-mail.xml.h:114
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ui/evolution-mail.xml.h:110
+#: ui/evolution-mail.xml.h:115
 msgid "_Mail Settings..."
 msgstr "_Configuración del correo..."
 
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail.xml.h:116
 msgid "_Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: ui/evolution-mail.xml.h:112
+#: ui/evolution-mail.xml.h:117
 msgid "_Move to Folder"
 msgstr "_Mover a la Carpeta"
 
-#: ui/evolution-mail.xml.h:113
+#: ui/evolution-mail.xml.h:118
 msgid "_Normal Display"
 msgstr "Vista _Normal"
 
-#: ui/evolution-mail.xml.h:114
+#: ui/evolution-mail.xml.h:119
 msgid "_Open Message"
 msgstr "_Abrir Mensaje"
 
-#: ui/evolution-mail.xml.h:116
+#: ui/evolution-mail.xml.h:121
 msgid "_Re-send Message"
 msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail.xml.h:119
+#: ui/evolution-mail.xml.h:124
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution-mail.xml.h:120
+#: ui/evolution-mail.xml.h:125
 msgid "_Threaded Message List"
 msgstr "_Lista de Mensajes Encadenados"
 
@@ -8804,158 +8852,166 @@ msgid "Close the current file"
 msgstr "Cerrar el archivo actual"
 
 #: ui/evolution-message-composer.xml.h:5
+msgid "Delete all but signature"
+msgstr "Borrar toda menos la firma"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Encriptar este mensaje con PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
 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
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormatear"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:10
 msgid "Insert a file as text into the message"
 msgstr "Insertar un archivo como texto en el mensaje"
 
-#: ui/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert text file..."
 msgstr "Insertar un archivo de texto..."
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr "Encriptar con PGP"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
 msgstr "Encriptar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Sign"
 msgstr "Firmar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _Draft"
 msgstr "Guardar _Borrador"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "Save in _folder... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Guardara el mensaje a una carpeta específica"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Enviar el mensaje más tarde"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Enviar este mensaje ahora"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Mostrar / ocultar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Mostrar _adjuntos"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Mostrar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con tu clave PGP"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:37
 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
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Activa si se muestra el campo CCO"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Activa si se muestra el campo CC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Activa si se muestra el selector 'De'"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Activa si se muestra el campo Responder-A"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
 msgstr "Campo Cc_o"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:46
+msgid "_Delete all"
+msgstr "_Borrar todo"
+
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Insert text file... (FIXME)"
 msgstr "_Insert text file... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:56
 msgid "_Security"
 msgstr "_Seguridad"
 
@@ -8991,6 +9047,10 @@ msgstr "Dessuscribir"
 msgid "Assig_n Task (FIXME)"
 msgstr "Assig_n Task (FIXME)"
 
+#: ui/evolution-task-editor-dialog.xml.h:23
+msgid "Find"
+msgstr "Buscar"
+
 #: ui/evolution-task-editor-dialog.xml.h:24
 msgid "Find Again"
 msgstr "Buscar de nuevo"
@@ -9047,7 +9107,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:42
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:43
 msgid "_Appointment (FIXME)"
 msgstr "_Appointment (FIXME)"
 
@@ -9063,19 +9123,19 @@ msgstr "_Reply (FIXME)"
 msgid "Create a new task"
 msgstr "Crear una nueva tarea"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
 msgid "New Task"
 msgstr "Nueva tarea"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Save task as something else"
 msgstr "Guardar la tarea como otra cosa"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:8
 msgid "Tasks Preferences..."
 msgstr "Preferencias de las tareas..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "_Task"
 msgstr "_Tarea"
 
@@ -9128,125 +9188,125 @@ msgid "Customize toolbars"
 msgstr "Personalizar barras de herramientas"
 
 #: ui/evolution.xml.h:14
+msgid "Delete this folder"
+msgstr "Borrar esta carpeta"
+
+#: ui/evolution.xml.h:15
 msgid "Display a different folder"
 msgstr "Mostrar una carpeta distinta"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:16
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:17
 msgid "Evolution _FAQ"
 msgstr "_FAQ de Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 msgid "Evolution _Window"
 msgstr "_Ventana de Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Evolution bar _shortcut"
 msgstr "Barra de _atajos de Evolution"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:20
 msgid "Exit the program"
 msgstr "Salir del programa"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Getting _Started"
 msgstr "Comenzando"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "Import an external file format"
 msgstr "Importar un formato de archivo externo"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
 msgid "Main toolbar"
 msgstr "Barra de herramientas principal"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:24
 msgid "Move this folder to another place"
 msgstr "Mueve esta carpeta a otro sitio"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "Open in New Window"
 msgstr "Abrir en una nueva ventana"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "Open in New _Window"
 msgstr "Abrir en una Nueva _Ventana"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "Open this folder in an other window"
 msgstr "Abre esta carpeta en una nueva ventana"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "Show information about Evolution"
 msgstr "Mostrar información acerca de Evolution"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:29
 msgid "Submit Bug Report"
 msgstr "Enviar reporte de fallo"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:30
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:31
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar un reporte de fallo usando Bug Buddy."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:32
 msgid "Toggle"
 msgstr "Activar"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:34
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
 msgstr "Activar si se estamos trabajando desconectados o no."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "Using the C_ontact Manager"
 msgstr "Usando el administrador de c_ontactos"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 msgid "Using the _Calendar"
 msgstr "Usando el _calendario"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:38
 msgid "Using the _Mailer"
 msgstr "Usando el _correo"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_About Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Acciones"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:46
 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"
@@ -9288,8 +9348,8 @@ msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
-msgstr "Tarjeta de visita"
+msgid "Address Cards"
+msgstr "Tarjetas de Visita"
 
 #: views/addressbook/galview.xml.h:2
 msgid "By Company"
@@ -9402,11 +9462,11 @@ msgstr "Todos los participantes"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Vista actual"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "Definir Vistas"
 
@@ -9507,6 +9567,142 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#~ msgid "Error adding card"
+#~ msgstr "Error añadiendo tarjeta"
+
+#~ msgid "Success"
+#~ msgstr "Exito"
+
+#~ msgid "Repository offline"
+#~ msgstr "Repositorio desconectado"
+
+#~ msgid "Card not found"
+#~ msgstr "Tarjeta no encontrada"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "Protocolo no soportado"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "Other error"
+#~ msgstr "Otro error"
+
+#~ msgid "Add Service"
+#~ msgstr "Añadir Servicio"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Añadir un nuevo servicio al Resumen de Trabajo"
+
+#~ msgid "Create a new email"
+#~ msgstr "Crear un nuevo mensaje electrónico"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Configuración del Resumen de Trabajo..."
+
+#~ msgid "New Mail"
+#~ msgstr "Nuevo"
+
+#~ msgid "Edit Task"
+#~ msgstr "Editar Tarea"
+
+#~ msgid "Appointment - %s"
+#~ msgstr "Cita - %s"
+
+#~ msgid "Task - %s"
+#~ msgstr "Tarea - %s"
+
+#~ msgid "Journal entry - %s"
+#~ msgstr "Entrada del diario - %s"
+
+#~ msgid "No summary"
+#~ msgstr "Sin resumen"
+
+#~ msgid "Edit Appointment"
+#~ msgstr "Editar Cita"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Bases de la citas"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Fecha de Ini_cio:"
+
+#~ msgid "Error hashing password."
+#~ msgstr "Error calculando el hash de la contraseña."
+
+#~ msgid "Invalid password."
+#~ msgstr "Contraseña erronea."
+
+#~ msgid "Could not sign: failed to create content info."
+#~ msgstr "No pude firmar: error al crear la información del contenido."
+
+#~ msgid "Could not sign: failed to create signing context."
+#~ msgstr "No pude firmar: error al crear el contexto a firmar."
+
+#~ msgid "Could not sign: failed to create signature."
+#~ msgstr "No pude firmar: error al crear la firma."
+
+#~ msgid "'clearsign' is not supported by S/MIME."
+#~ msgstr "'firma en claro' no está soportado por S/MIME."
+
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "No pude encriptar: error al crear la información del sobre."
+
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "No pude encriptar: error al crear el contexto de encriptación."
+
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "No pude encriptar: clave de usuario invalida: \"%s\"."
+
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "No pude encriptar: error en la codificación."
+
+#~ msgid "Failed to decrypt: Unknown"
+#~ msgstr "Fallo al desencriptar: Desconocido"
+
+#~ 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."
+
+#~ msgid "sign and encrypt"
+#~ msgstr "firmar y encriptar"
+
+#~ msgid "sign"
+#~ msgstr "firmar"
+
+#~ msgid "encrypt"
+#~ msgstr "encriptar"
+
+#~ msgid "PGP"
+#~ msgstr "PGP"
+
+#~ msgid "Could not create a S/MIME verification context."
+#~ msgstr "No pude crear un contexto de verificación S/MIME."
+
+#~ msgid "Flagged"
+#~ msgstr "Marcado"
+
+#~ msgid "Received"
+#~ msgstr "Recibido"
+
+#~ msgid "Size"
+#~ msgstr "Tamaño"
+
+#~ msgid "Delete a contact"
+#~ msgstr "Borrar un contacto"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Como _mini tarjetas"
+
+#~ msgid "As _Table"
+#~ msgstr "Como _Tabla"
+
+#~ msgid "Find a contact"
+#~ msgstr "Buscar un contacto"
+
 #~ msgid "Mark Complete"
 #~ msgstr "Marcar como completa"