Updated Spanish translation.

svn path=/trunk/; revision=10891

2 files changed, 3247 insertions, 1529 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 15d24fc69c..a3b217e338 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -8,6 +8,10 @@
 	calendar/gui/dialogs/e-timezone-dialog.glade
 	mail/mail-folder-cache.c
 
+2001-07-08  Hector Garcia Alvarez <hector@scouts-es.org>
+
+        * es.po: Updated Spanish translation.
+	
 2001-07-07  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/es.po b/po/es.po
index 4342b4ce80..15e7dc5711 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-06-26 19:57+0200\n"
+"POT-Creation-Date: 2001-07-06 13:14+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:3324
+#: addressbook/backend/ebook/e-card.c:3546
 msgid "Card: "
 msgstr "Tarjeta: "
 
-#: addressbook/backend/ebook/e-card.c:3326
+#: addressbook/backend/ebook/e-card.c:3548
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +26,7 @@ msgstr ""
 "\n"
 "Nombre:"
 
-#: addressbook/backend/ebook/e-card.c:3327
+#: addressbook/backend/ebook/e-card.c:3549
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 "  Prefijo:    "
 
-#: addressbook/backend/ebook/e-card.c:3328
+#: addressbook/backend/ebook/e-card.c:3550
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +42,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3551
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +50,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3330
+#: addressbook/backend/ebook/e-card.c:3552
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3553
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 "  Sufijo:     "
 
-#: addressbook/backend/ebook/e-card.c:3345
+#: addressbook/backend/ebook/e-card.c:3567
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "Fecha de nacimiento: "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3578
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +82,7 @@ msgstr ""
 "\n"
 "Dirección:"
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3580
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +90,7 @@ msgstr ""
 "\n"
 "  Dirección postal: "
 
-#: addressbook/backend/ebook/e-card.c:3359
+#: addressbook/backend/ebook/e-card.c:3581
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +98,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3360
+#: addressbook/backend/ebook/e-card.c:3582
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +106,7 @@ msgstr ""
 "\n"
 "  Calle:       "
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3583
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 "  Ciudad:      "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3584
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +122,7 @@ msgstr ""
 "\n"
 "  Región:      "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3585
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +130,7 @@ msgstr ""
 "\n"
 "  Código postal: "
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3586
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +138,7 @@ msgstr ""
 "\n"
 "  País:        "
 
-#: addressbook/backend/ebook/e-card.c:3377
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +146,7 @@ msgstr ""
 "\n"
 "Etiqueta de envío: "
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +154,7 @@ msgstr ""
 "\n"
 "Teléfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3614
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +162,7 @@ msgstr ""
 "\n"
 "Teléfono:"
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3638
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +170,7 @@ msgstr ""
 "\n"
 "Correo electrónico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3419
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "Correo electrónico:"
 
-#: addressbook/backend/ebook/e-card.c:3438
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "Programa de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3444
+#: addressbook/backend/ebook/e-card.c:3666
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3452
+#: addressbook/backend/ebook/e-card.c:3674
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +202,7 @@ msgstr ""
 "\n"
 "Localización geográfica: "
 
-#: addressbook/backend/ebook/e-card.c:3456
+#: addressbook/backend/ebook/e-card.c:3678
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +210,7 @@ msgstr ""
 "\n"
 "Cargo: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +218,7 @@ msgstr ""
 "\n"
 "Organización: "
 
-#: addressbook/backend/ebook/e-card.c:3469
+#: addressbook/backend/ebook/e-card.c:3691
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +226,7 @@ msgstr ""
 "\n"
 "  Nombre: "
 
-#: addressbook/backend/ebook/e-card.c:3470
+#: addressbook/backend/ebook/e-card.c:3692
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +234,7 @@ msgstr ""
 "\n"
 "  Unidad: "
 
-#: addressbook/backend/ebook/e-card.c:3471
+#: addressbook/backend/ebook/e-card.c:3693
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +242,7 @@ msgstr ""
 "\n"
 "  Unidad2: "
 
-#: addressbook/backend/ebook/e-card.c:3472
+#: addressbook/backend/ebook/e-card.c:3694
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidad3: "
 
-#: addressbook/backend/ebook/e-card.c:3473
+#: addressbook/backend/ebook/e-card.c:3695
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidad4: "
 
-#: addressbook/backend/ebook/e-card.c:3477
+#: addressbook/backend/ebook/e-card.c:3699
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +266,7 @@ msgstr ""
 "\n"
 "categorías: "
 
-#: addressbook/backend/ebook/e-card.c:3478
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +284,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3491
+#: addressbook/backend/ebook/e-card.c:3713
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +292,7 @@ msgstr ""
 "\n"
 "Cadena única: "
 
-#: addressbook/backend/ebook/e-card.c:3494
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "Public Key: "
@@ -300,16 +300,16 @@ msgstr ""
 "\n"
 "Llave pública: "
 
-#: addressbook/backend/ebook/e-card.c:3756
+#: addressbook/backend/ebook/e-card.c:3978
 msgid "Multiple VCards"
 msgstr "VCards Múltiples"
 
-#: addressbook/backend/ebook/e-card.c:3764
+#: addressbook/backend/ebook/e-card.c:3986
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
 
-#: addressbook/backend/ebook/e-destination.c:244
+#: addressbook/backend/ebook/e-destination.c:344
 msgid "???"
 msgstr "???"
 
@@ -393,7 +393,7 @@ msgid "Contact Editor"
 msgstr "Editor de contactos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:123
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detalles"
 
@@ -402,7 +402,7 @@ msgid "File As:"
 msgstr "Archivar como:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "General"
 
@@ -418,8 +418,9 @@ msgstr "No_tas:"
 msgid "Phone Types"
 msgstr "Tipos de teléfono"
 
+#: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1432
+#: addressbook/gui/contact-editor/e-contact-editor.c:1476
 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/gui/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:101
 msgid "_Add"
 msgstr "_Añadir"
 
@@ -457,9 +458,9 @@ msgid "_Company:"
 msgstr "_Compañía:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1273 mail/mail-config.glade.h:95
-#: ui/evolution-mail.xml.h:116 ui/evolution-tasks.xml.h:9
-#: ui/evolution.xml.h:47
+#: mail/folder-browser.c:1237 mail/mail-config.glade.h:102
+#: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -507,105 +508,107 @@ msgstr "_Cónyuge:"
 msgid "_This is the mailing address"
 msgstr "Es_tá es la dirección de correo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:658
+#: addressbook/gui/contact-editor/e-contact-editor.c:663
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto está en estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1390
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1434
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1391
-#: addressbook/gui/contact-editor/e-contact-editor.c:1458
+#: addressbook/gui/contact-editor/e-contact-editor.c:1435
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1392
+#: addressbook/gui/contact-editor/e-contact-editor.c:1436
 msgid "Business 2"
 msgstr "Trabajo 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1393
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1437
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1394
+#: addressbook/gui/contact-editor/e-contact-editor.c:1438
 msgid "Callback"
 msgstr "Rellamada"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1395
+#: addressbook/gui/contact-editor/e-contact-editor.c:1439
 msgid "Car"
 msgstr "Coche"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1396
+#: addressbook/gui/contact-editor/e-contact-editor.c:1440
 msgid "Company"
 msgstr "Compañía"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1397
-#: addressbook/gui/contact-editor/e-contact-editor.c:1459
+#: addressbook/gui/contact-editor/e-contact-editor.c:1441
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1398
+#: addressbook/gui/contact-editor/e-contact-editor.c:1442
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1399
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1443
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1400
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1401
+#: addressbook/gui/contact-editor/e-contact-editor.c:1445
 msgid "Mobile"
 msgstr "Móvil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1402
-#: addressbook/gui/contact-editor/e-contact-editor.c:1460
-#: mail/mail-config.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor.c:1446
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: mail/mail-config.glade.h:59
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1403
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1447
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Fax"
 msgstr "Otro fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1404
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1448
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Pager"
 msgstr "Papel"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1405
+#: addressbook/gui/contact-editor/e-contact-editor.c:1449
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1406
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1450
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1407
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1451
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1408
+#: addressbook/gui/contact-editor/e-contact-editor.c:1452
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1433
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1477
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Email 2"
 msgstr "Correo electrónico 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1478
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 3"
 msgstr "Correo electrónico 3"
 
@@ -622,7 +625,7 @@ msgid "Edit Full"
 msgstr "Editar Todo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Full Name"
 msgstr "Nombre Completo"
 
@@ -781,19 +784,23 @@ 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:553 calendar/gui/gnome-cal.c:215
+#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:554
+#: addressbook/gui/component/addressbook.c:555
 msgid "Name contains"
 msgstr "El nombre contiene"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:556
 msgid "Email contains"
 msgstr "El mensaje contiene"
 
-#: addressbook/gui/component/addressbook.c:701
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr "La categría contiene"
+
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrará el visor de carpetas"
 
@@ -815,8 +822,8 @@ 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:59
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
 msgid "Password"
 msgstr "Clave"
 
@@ -849,12 +856,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:68
+#: mail/mail-config.glade.h:73
 msgid "Remember this password"
 msgstr "Recuerda esta contraseña"
 
 #: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Host:"
 msgstr "Servidor:"
 
@@ -891,7 +898,7 @@ msgid "Advanced LDAP Options"
 msgstr "Opciones avanzadas de LDAP"
 
 #: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:64
 msgid "Path:"
 msgstr "Ruta:"
 
@@ -920,7 +927,7 @@ msgstr ""
 "información relevante acerca de ella."
 
 #: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:53
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -944,12 +951,12 @@ 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:603
+#: addressbook/gui/widgets/e-addressbook-view.c:606
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 #: calendar/gui/dialogs/recurrence-page.glade.h:5 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:8
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:3
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
 msgid "Delete"
 msgstr "Borrar"
 
@@ -970,24 +977,57 @@ msgstr "URI"
 msgid "Other Contacts"
 msgstr "Otros contactos"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Deshabilitar Consultas"
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(nada)"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Habilitar Consultas (¡Peligroso!)"
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
+msgstr "Elija un archivo"
 
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crear nuevo contacto \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Añadir dirección al contacto existente \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
+msgstr "Consultando la Agenda de Direcciones..."
+
+#: addressbook/gui/component/e-address-popup.c:916
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:276
 msgid "Edit Contact Info"
 msgstr "Editar información de contacto"
 
+#: addressbook/gui/component/e-address-popup.c:946
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:342
 msgid "Add to Contacts"
 msgstr "Añadir a Contactos"
 
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
+msgstr "Fusionar Direcciónes de Correo"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Deshabilitar Consultas"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Habilitar Consultas (¡Peligroso!)"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
 msgid "A Bonobo control for an address popup."
 msgstr "Un control Bonobo para una ventada de dirección."
@@ -1035,7 +1075,7 @@ msgstr "Factoría para el control de ejemplo de la Agenda"
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
 #: composer/e-msg-composer-attachment-bar.c:477 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
+#: shell/e-shortcuts-view.c:272 shell/e-shortcuts-view.c:475
 msgid "Remove"
 msgstr "Quitar"
 
@@ -1056,20 +1096,25 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factoría para la interfaz de selección de nombre de la Agenda"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Buscar..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Message Recipients"
 msgstr "Lista de destinatarios"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Select Names"
 msgstr "_Seleccionar nombres"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
+msgstr "Seleccionar nombre de la _carpeta:"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Seleccionar nombre de:"
+msgid "_Category:"
+msgstr "_Categoría:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Buscar"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
@@ -1231,163 +1276,164 @@ 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:538
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Guardar como vCard"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 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:600
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 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:601 mail/message-browser.c:208
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:76 ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
+#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:697
+#: addressbook/gui/widgets/e-addressbook-view.c:700
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aquí para añadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "File As"
 msgstr "Archivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Primary Phone"
 msgstr "Teléfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Assistant Phone"
 msgstr "Teléfono del Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Business Phone"
 msgstr "Teléfono del Trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Callback Phone"
 msgstr "Teléfono para rellamadas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Company Phone"
 msgstr "Teléfono de la compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Business Address"
 msgstr "Dirección del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Home Address"
 msgstr "Dirección de su casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Car Phone"
 msgstr "Teléfono del coche"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Business Phone 2"
 msgstr "Teléfono del trabajo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Home Phone 2"
 msgstr "Teléfono de casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "Other Phone"
 msgstr "Otro teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "Other Address"
 msgstr "Otra dirección"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Title"
 msgstr "Título"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Profession"
 msgstr "Profesión"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Manager"
 msgstr "Encargado"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Nickname"
 msgstr "Nick"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Spouse"
 msgstr "Cónyuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Free-busy URL"
 msgstr "URL de disponibilidad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Done."
 msgstr "Hecho."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1111
+#: addressbook/gui/widgets/e-addressbook-view.c:1114
 msgid "Removing cards..."
 msgstr "Eliminando tarjetas..."
 
-#: addressbook/gui/widgets/e-minicard.c:436
+#: addressbook/gui/widgets/e-minicard.c:451
 msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
@@ -1592,20 +1638,20 @@ msgstr "No pude leer información de la aplicación de calendario del pilot"
 msgid "Could not read pilot's ToDo application block"
 msgstr "No pude leer los datos de la aplicación ToDo de la pilot"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:631
-#: calendar/gui/alarm-notify/alarm-queue.c:930
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:623
+#: calendar/gui/alarm-notify/alarm-queue.c:922
+#: calendar/gui/alarm-notify/alarm-queue.c:978
 msgid "Reminder of your appointment at "
 msgstr "Recordatorio de su cita a las "
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:922
+#: calendar/gui/alarm-notify/alarm-queue.c:914
 msgid "Snooze"
 msgstr "Recordatorio"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:935
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:927
+#: calendar/gui/alarm-notify/alarm-queue.c:982
 msgid "Ok"
 msgstr "Ok"
 
@@ -1617,23 +1663,77 @@ msgstr "Servicio de notificación de alarmas"
 msgid "Factory for the alarm notification service"
 msgstr "Factoria para la alarma del servicio denotificación"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma en %A %b %d %Y %H:%M"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Notificación sobre su cita que comienza a las %s y acaba a las %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Notificación sobre su cita que comienza a las %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Notificación sobre su cita que finaliza a las %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
+msgid "Notification about your appointment"
+msgstr "Notificación sobre su cita"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Notificación sobre su tarea que comienza a las %s y acaba a las %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:177
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Notificación sobre su tarea que comienza a las %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:182
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Notificación sobre su tarea que finaliza a las %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:186
+msgid "Notification about your task"
+msgstr "Notificación sobre su tarea"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
+#, fuzzy, c-format
+msgid "Notification about your journal entry starting on %s and ending on %s"
+msgstr "Notificación sobre su cita en %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
+#, fuzzy, c-format
+msgid "Notification about your journal entry starting on %s"
+msgstr "Notificación sobre su cita en %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
+#, fuzzy, c-format
+msgid "Notification about your journal entry ending on %s"
+msgstr "Notificación sobre su cita en %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
+#, fuzzy
+msgid "Notification about your journal entry"
 msgstr "Notificación sobre su cita en %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:207
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarma en %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:301
 msgid "No summary available."
 msgstr "No hay un sumario disponible."
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1666,125 +1766,126 @@ msgstr "No se puede inicializar gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "No pude crear la factoría del servicio de la alarma de notificación"
 
-#: calendar/gui/calendar-commands.c:275
+#: calendar/gui/calendar-commands.c:278
 msgid "File not found"
 msgstr "Archivo no encontrado"
 
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:302
 msgid "Open calendar"
 msgstr "Abrir calendario"
 
-#: calendar/gui/calendar-commands.c:341
+#: calendar/gui/calendar-commands.c:344
 msgid "Save calendar"
 msgstr "Guardar calendario"
 
-#: calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:596
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "No pude mostrar el calendario.  Por favor compruebe su ORBit y su OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:418
+#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:974
+#: calendar/gui/e-calendar-table.c:426
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:904
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
+#: calendar/gui/e-calendar-table.c:427
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:906
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
+#: calendar/gui/e-calendar-table.c:428
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: 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
+#: calendar/gui/calendar-model.c:388 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:479
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:479
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:481
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:481
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1070
+#: calendar/gui/calendar-model.c:519 calendar/gui/calendar-model.c:1150
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:440 mail/message-list.c:620
+#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:620
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1072
-#: calendar/gui/calendar-model.c:1595
+#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1152
+#: calendar/gui/calendar-model.c:1675
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:441 mail/message-list.c:619
+#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:619
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1074
+#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1154
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:442 mail/message-list.c:618
+#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:618
 msgid "Low"
 msgstr "Baja"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1126
-#: calendar/gui/e-calendar-table.c:494
+#: calendar/gui/calendar-model.c:559 calendar/gui/calendar-model.c:1206
+#: calendar/gui/e-calendar-table.c:502
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1128
-#: calendar/gui/e-calendar-table.c:493
+#: calendar/gui/calendar-model.c:562 calendar/gui/calendar-model.c:1208
+#: calendar/gui/e-calendar-table.c:501
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:711 calendar/gui/calendar-model.c:1260
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:514
+#: calendar/gui/e-calendar-table.c:522
 msgid "Not Started"
 msgstr "Sin comenzando"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:714 calendar/gui/calendar-model.c:1262
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:515
+#: calendar/gui/e-calendar-table.c:523
 msgid "In Progress"
 msgstr "En proceso"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1184
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1264
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:516
+#: calendar/gui/e-calendar-table.c:524
 msgid "Completed"
 msgstr "Completado"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1186
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1266
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:517 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Cancelar"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:798 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:801 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:873 e-util/e-time-utils.c:276
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:806
+#: calendar/gui/calendar-model.c:878
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1795,24 +1896,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:886
+#: calendar/gui/calendar-model.c:958
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 "La clasificación debe ser 'Pública', 'Privada', 'Confidencial' o 'Ninguna'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:900 calendar/gui/calendar-model.c:1124
-#: calendar/gui/calendar-model.c:1178 calendar/gui/e-calendar-table.c:417
-#: calendar/gui/e-calendar-table.c:492 mail/mail-account-gui.c:1005
-#: mail/mail-accounts.c:125 mail/mail-accounts.c:176
-#: mail/mail-config.glade.h:52 shell/e-shell-view.c:1379
-#: 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
+#: calendar/gui/calendar-model.c:972 calendar/gui/calendar-model.c:1204
+#: calendar/gui/calendar-model.c:1258 calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:500 mail/mail-account-gui.c:1295
+#: mail/mail-accounts.c:129 mail/mail-accounts.c:380
+#: mail/mail-config.glade.h:56 shell/e-shell-view.c:1397
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-dateedit.c:1369 widgets/misc/e-dateedit.c:1484
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:974
+#: calendar/gui/calendar-model.c:1054
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1822,38 +1923,38 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1014
+#: calendar/gui/calendar-model.c:1094
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1135
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "La prioridad debe ser 'Alta', 'Normal', 'Baja' o 'Indefinida'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1068
+#: calendar/gui/calendar-model.c:1148
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:451
 msgid "Undefined"
 msgstr "Sin definir"
 
-#: calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1189
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "La transparencia debe ser 'Transparente', 'Opaca' o 'Ninguna'."
 
-#: calendar/gui/calendar-model.c:1597
+#: calendar/gui/calendar-model.c:1677
 msgid "Recurring"
 msgstr "Recurriendo"
 
-#: calendar/gui/calendar-model.c:1599
+#: calendar/gui/calendar-model.c:1679
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1605
+#: calendar/gui/calendar-model.c:1685
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1605
+#: calendar/gui/calendar-model.c:1685
 msgid "No"
 msgstr "No"
 
@@ -1861,84 +1962,83 @@ msgstr "No"
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrará el calendario"
 
-#: calendar/gui/dialogs/alarm-page.c:255
+#: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d days"
 msgstr "%d días"
 
-#: calendar/gui/dialogs/alarm-page.c:257
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 día"
 
-#: calendar/gui/dialogs/alarm-page.c:260
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:262
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 semana"
 
-#: calendar/gui/dialogs/alarm-page.c:265
+#: calendar/gui/dialogs/alarm-page.c:294
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
-#: calendar/gui/dialogs/alarm-page.c:267
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 hora"
 
-#: calendar/gui/dialogs/alarm-page.c:270
+#: calendar/gui/dialogs/alarm-page.c:299
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:272
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:275
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:277
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:302
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Play a sound"
 msgstr "Tocar un sonido"
 
-#: calendar/gui/dialogs/alarm-page.c:306
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.c:335
 msgid "Show a dialog"
 msgstr "Mostrar un diálogo"
 
-#: calendar/gui/dialogs/alarm-page.c:310
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "Send an email"
 msgstr "Enviar un correo"
 
-#: calendar/gui/dialogs/alarm-page.c:314
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:9
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
-#: calendar/gui/dialogs/alarm-page.c:332
+#: calendar/gui/dialogs/alarm-page.c:361
 msgid " before start of appointment"
 msgstr "antes del inicio de la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:364
 msgid " after start of appointment"
 msgstr "tras el inicio de la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:345
+#: calendar/gui/dialogs/alarm-page.c:374
 msgid " before end of appointment"
 msgstr "antes del fin de la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:348
+#: calendar/gui/dialogs/alarm-page.c:377
 msgid " after end of appointment"
 msgstr "tras el fin de la cita"
 
@@ -1955,18 +2055,22 @@ msgstr "Bases"
 msgid "Date/Time:"
 msgstr "Fecha/Hora:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+msgid "Display a message"
+msgstr "Mostrar un mensaje"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Options..."
+msgstr "Opciónes..."
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 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/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
@@ -1993,7 +2097,7 @@ msgstr "fin de la cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:97
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:104
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -2030,226 +2134,175 @@ msgid "60 minutes"
 msgstr "60 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Las alarmas cesan tras"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmas auditivas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Pitar cuando aparezca la ventana de la alarma."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9 shell/e-shortcuts.c:1001
+#: ui/evolution-calendar.xml.h:4
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Preferencias del calendario"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Colores"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Compress weekends in month view"
 msgstr "Comprimir fines de semana en la vista mensual"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Opciónes de la fecha del navegador"
+msgid "Date Navigator"
+msgstr "Navegador de Fechas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Defaults"
 msgstr "Valores predeterminados"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Mostrar opciónes"
+#: mail/mail-config.glade.h:29
+msgid "Display"
+msgstr "Mostrar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:248
-msgid "Due Date"
-msgstr "Fecha de plazo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Habilitar recordatorio para"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Fin del día:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Primer día de la semana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Vier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:918
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:985
 msgid "Friday"
 msgstr "Viernes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Highlight"
-msgstr "Resaltar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today"
-msgstr "Elementos de plazo hoy"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Due Today:"
-msgstr "Elementos con plazo para hoy:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due"
-msgstr "Elementos dentro de plazo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Items Not Yet Due:"
-msgstr "Elementos dentro del plazo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:914
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "Monday"
 msgstr "Lunes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items"
-msgstr "Elementos fuera de plazo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Overdue Items:"
-msgstr "Elementos fuera de plazo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: mail/mail-config.glade.h:61
-msgid "Pick a color"
-msgstr "Elije un color"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr "Opciones de Notificación"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/e-calendar-table.c:251
-msgid "Priority"
-msgstr "Prioridad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
+msgstr "Tareas fuera de plazo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Recuerdame todas las citas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Sab"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:986
 msgid "Saturday"
 msgstr "Sábado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show"
-msgstr "Mostrar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Mostrar la hora del final de las citas en las vistas semanales y mensuales"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Mostrar los números de las semanas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Comienzo del día:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:920
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:987
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "TaskPad"
-msgstr "Tabla de tares"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Task List"
+msgstr "Lista de Tareas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
+msgstr "Tareas de plazo hoy"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Jue"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:984
 msgid "Thursday"
 msgstr "Jueves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Time"
 msgstr "Hora"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time Until Due"
-msgstr "Tiempo hasta el plazo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Divisiónes de tiempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Formato del tiempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time zone:"
 msgstr "Zona horaria:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/dialogs/recurrence-page.c:915
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "Tuesday"
 msgstr "Martes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Visual Alarms"
-msgstr "Alarmas visuales"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Mier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: calendar/gui/dialogs/recurrence-page.c:916
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:983
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "Work week"
-msgstr "Semana laboral"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Work Week"
+msgstr "Semana Laboral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutos antes de que ocurra."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-#: mail/mail-config.glade.h:99
-msgid "seconds."
-msgstr "segundos."
-
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2305,7 +2358,7 @@ msgid "Recurrence"
 msgstr "Recurrencia"
 
 #: calendar/gui/dialogs/event-editor.c:151
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:228
 msgid "Meeting"
 msgstr "Reunión"
 
@@ -2315,7 +2368,7 @@ msgstr "Evento para todo e_l día"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:244
+#: calendar/gui/e-calendar-table.c:248
 msgid "Classification"
 msgstr "Clasificación"
 
@@ -2413,32 +2466,32 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "año(s)"
 
-#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1978
+#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1978
 #: calendar/gui/print.c:1980 calendar/gui/print.c:1981
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:544
+#: calendar/gui/dialogs/recurrence-page.c:582
 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
+#: calendar/gui/dialogs/recurrence-page.c:954
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
+#: calendar/gui/dialogs/recurrence-page.c:980 filter/filter-datespec.c:81
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1110
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1051
+#: calendar/gui/dialogs/recurrence-page.c:1118
 msgid "th"
 msgstr "º"
 
-#: calendar/gui/dialogs/recurrence-page.c:1215
+#: calendar/gui/dialogs/recurrence-page.c:1288
 msgid "occurrences"
 msgstr "ocurrencias"
 
@@ -2450,11 +2503,28 @@ msgstr "¿Desea guardar los cambios?"
 msgid "Date Completed:"
 msgstr "Fecha Completada:"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+msgid "Delegated From:"
+msgstr "Delegado Por:"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Delegated To:"
+msgstr "Delegado A:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+msgid "No one"
+msgstr "Ninguno"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizador:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:118
+#: calendar/gui/dialogs/task-editor.c:130
 msgid "Task"
 msgstr "Tarea"
 
@@ -2483,211 +2553,223 @@ msgstr "_Prioridad:"
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-calendar-table.c:243
+#: calendar/gui/e-calendar-table.c:247
 msgid "Categories"
 msgstr "Categorías"
 
-#: calendar/gui/e-calendar-table.c:245
+#: calendar/gui/e-calendar-table.c:249
 msgid "Completion Date"
 msgstr "Fecha de vencimiento"
 
-#: calendar/gui/e-calendar-table.c:246
+#: calendar/gui/e-calendar-table.c:250
 msgid "End Date"
 msgstr "Fecha fin"
 
-#: calendar/gui/e-calendar-table.c:247
+#: calendar/gui/e-calendar-table.c:251
 msgid "Start Date"
 msgstr "Fecha de Inicio"
 
-#: calendar/gui/e-calendar-table.c:249
+#: calendar/gui/e-calendar-table.c:252
+msgid "Due Date"
+msgstr "Fecha de plazo"
+
+#: calendar/gui/e-calendar-table.c:253
 msgid "Geographical Position"
 msgstr "Posición geográfica"
 
-#: calendar/gui/e-calendar-table.c:250
+#: calendar/gui/e-calendar-table.c:254
 msgid "Percent complete"
 msgstr "Porcentaje completado"
 
-#: calendar/gui/e-calendar-table.c:252
+#: calendar/gui/e-calendar-table.c:255
+msgid "Priority"
+msgstr "Prioridad"
+
+#: calendar/gui/e-calendar-table.c:256
 msgid "Summary"
 msgstr "Resumen"
 
-#: calendar/gui/e-calendar-table.c:253
+#: calendar/gui/e-calendar-table.c:257
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: calendar/gui/e-calendar-table.c:254
+#: calendar/gui/e-calendar-table.c:258
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:255
+#: calendar/gui/e-calendar-table.c:259
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.c:256
+#: calendar/gui/e-calendar-table.c:260
 msgid "Click here to add a task"
 msgstr "Pulse aquí para añadir una tarea"
 
-#: calendar/gui/e-calendar-table.c:462
+#: calendar/gui/e-calendar-table.c:470
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:463
+#: calendar/gui/e-calendar-table.c:471
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:464
+#: calendar/gui/e-calendar-table.c:472
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:465
+#: calendar/gui/e-calendar-table.c:473
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:466
+#: calendar/gui/e-calendar-table.c:474
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:467
+#: calendar/gui/e-calendar-table.c:475
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:468
+#: calendar/gui/e-calendar-table.c:476
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:469
+#: calendar/gui/e-calendar-table.c:477
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/e-calendar-table.c:478
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-calendar-table.c:479
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-calendar-table.c:480
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-table.c:957
 msgid "Edit this task"
 msgstr "Editar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:868 calendar/gui/e-calendar-table.c:878
-#: calendar/gui/e-day-view.c:3204 calendar/gui/e-week-view.c:3041
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail.xml.h:24
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-day-view.c:3315 calendar/gui/e-week-view.c:3158
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: calendar/gui/e-calendar-table.c:869 calendar/gui/e-calendar-table.c:879
-#: calendar/gui/e-day-view.c:3206 calendar/gui/e-week-view.c:3043
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail.xml.h:9
+#: calendar/gui/e-calendar-table.c:959 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3317 calendar/gui/e-week-view.c:3160
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
 msgid "Copy"
 msgstr "Copiar"
 
-#: calendar/gui/e-calendar-table.c:870 calendar/gui/e-calendar-table.c:880
-#: calendar/gui/e-day-view.c:3179 calendar/gui/e-day-view.c:3208
-#: calendar/gui/e-week-view.c:3017 calendar/gui/e-week-view.c:3045
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:70
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-day-view.c:3290 calendar/gui/e-day-view.c:3319
+#: calendar/gui/e-week-view.c:3134 calendar/gui/e-week-view.c:3162
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
+#: ui/evolution-mail-list.xml.h:12
 msgid "Paste"
 msgstr "Pegar"
 
-#: calendar/gui/e-calendar-table.c:872
+#: calendar/gui/e-calendar-table.c:962
 msgid "Mark as complete"
 msgstr "Marcar como completa"
 
-#: calendar/gui/e-calendar-table.c:873
+#: calendar/gui/e-calendar-table.c:963
 msgid "Delete this task"
 msgstr "Borrar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:882
+#: calendar/gui/e-calendar-table.c:972
 msgid "Mark tasks as complete"
 msgstr "Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:883 ui/evolution-tasks.xml.h:4
+#: calendar/gui/e-calendar-table.c:973 ui/evolution-tasks.xml.h:6
 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:572 calendar/gui/e-week-view.c:306
+#: calendar/gui/e-day-view.c:574 calendar/gui/e-week-view.c:307
 #: calendar/gui/print.c:785
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:577 calendar/gui/e-week-view.c:310
 #: calendar/gui/print.c:787
 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:1325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1327
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
 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:1339
+#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1341
 #: 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:1352
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:3184 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3295 ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/e-day-view.c:3186 calendar/gui/e-week-view.c:3024
+#: calendar/gui/e-day-view.c:3297 calendar/gui/e-week-view.c:3141
 msgid "New All Day Event"
 msgstr "Nuevo evento para todo el día"
 
-#: calendar/gui/e-day-view.c:3191 calendar/gui/e-week-view.c:3029
+#: calendar/gui/e-day-view.c:3302 calendar/gui/e-week-view.c:3146
 msgid "Go to Today"
 msgstr "Ir a hoy"
 
-#: calendar/gui/e-day-view.c:3193 calendar/gui/e-week-view.c:3031
+#: calendar/gui/e-day-view.c:3304 calendar/gui/e-week-view.c:3148
 msgid "Go to Date..."
 msgstr "Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3200 calendar/gui/e-week-view.c:3037
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:12
+#: calendar/gui/e-day-view.c:3311 calendar/gui/e-week-view.c:3154
+#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
+#: ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "Abrir"
 
-#: calendar/gui/e-day-view.c:3202 calendar/gui/e-week-view.c:3039
+#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3156
 msgid "Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3217 calendar/gui/e-week-view.c:3059
+#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3176
 msgid "Make this Occurrence Movable"
 msgstr "Hacer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3219 calendar/gui/e-week-view.c:3061
+#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3178
 msgid "Delete this Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3221
+#: calendar/gui/e-day-view.c:3332
 msgid "Delete all Occurrences"
 msgstr "Borrar todas las Ocurrencias"
 
@@ -2696,104 +2778,104 @@ msgstr "Borrar todas las Ocurrencias"
 msgid "%02i minute divisions"
 msgstr "%02i divisiónes por minuto"
 
-#: calendar/gui/e-itip-control.c:544 calendar/gui/print.c:2237
+#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/e-itip-control.c:548 calendar/gui/print.c:2241
+#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
 msgid " (Completed "
 msgstr "(Completado "
 
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2243
+#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
 msgid "Completed "
 msgstr "Completado "
 
-#: calendar/gui/e-itip-control.c:555 calendar/gui/print.c:2248
+#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
 msgid " (Due "
 msgstr " (Falta "
 
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2250
+#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
 msgid "Due "
 msgstr "Falta "
 
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:613
 msgid "This is an event that can be added to your calendar."
 msgstr "Este es un evento que puede ser añadido a su calendario."
 
-#: calendar/gui/e-itip-control.c:614
+#: calendar/gui/e-itip-control.c:616
 msgid "This is a meeting request."
 msgstr "Esta es una petición de reunión."
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:619
 msgid "This is one or more additions to a current meeting."
 msgstr "Esto es una o más adiciones a su encuentro actual."
 
-#: calendar/gui/e-itip-control.c:620
+#: calendar/gui/e-itip-control.c:622
 msgid "This is a request for the latest event information."
 msgstr "Esta es una petición sobre la última infromación del evento."
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:625
 msgid "This is a reply to a meeting request."
 msgstr "Esta es una respuesta a una petición de encuentro."
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:628
 msgid "This is an event cancellation."
 msgstr "Esta es la cancelación de un evento."
 
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:668
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:698
 msgid "The message is not understandable."
 msgstr "Este mensaje no es comprensible."
 
-#: calendar/gui/e-itip-control.c:653
+#: calendar/gui/e-itip-control.c:655
 msgid "This is an task that can be added to your calendar."
 msgstr "Esta es una tarea que puede ser añadida a su calendario."
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:658
 msgid "This is a task request."
 msgstr "Esta es una petición de tarea."
 
-#: calendar/gui/e-itip-control.c:659
+#: calendar/gui/e-itip-control.c:661
 msgid "This is a request for the latest task information."
 msgstr "Esta es una petición para la última información de la tarea."
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:664
 msgid "This is a reply to a task request."
 msgstr "Esta es una respuesta a una petición de tarea."
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:667
 msgid "This is an task cancellation."
 msgstr "Esto es una cancelación de tarea."
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:689
 msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:692
 msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:695
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:718
 msgid "The message does not appear to be properly formed"
 msgstr "Este mensaje no parece haber sido creado correctamente"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:737
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje solo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:751
+#: calendar/gui/e-itip-control.c:753
 msgid "The information contained in this attachment was not valid"
 msgstr "La información dentro de este adjunto no era válida"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:869
 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:892
+#: calendar/gui/e-itip-control.c:894
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "¡No pude quitar el elemento del archivo de su calendario!\n"
 
@@ -2822,10 +2904,6 @@ msgstr "Cargando calendario"
 msgid "Loading calendar..."
 msgstr "Cargando calendario..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizador:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mensaje del Servidor:"
@@ -2838,30 +2916,30 @@ msgstr "fecha de fin"
 msgid "date-start"
 msgstr "fecha de inicio"
 
-#: calendar/gui/e-tasks.c:185 calendar/gui/e-tasks.c:522
-#: calendar/gui/e-tasks.c:555
+#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
+#: calendar/gui/e-tasks.c:554
 msgid "All"
 msgstr "Todo"
 
-#: calendar/gui/e-tasks.c:191
+#: calendar/gui/e-tasks.c:190
 msgid "Category:"
 msgstr "Categorías:"
 
-#: calendar/gui/e-tasks.c:330
+#: calendar/gui/e-tasks.c:329
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No puedo cargar las tareas en `%s'"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:341
 #, 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/e-week-view.c:3022 calendar/gui/e-week-view.c:3050
+#: calendar/gui/e-week-view.c:3139 calendar/gui/e-week-view.c:3167
 msgid "New Appointment..."
 msgstr "Nueva Cita..."
 
-#: calendar/gui/e-week-view.c:3063
+#: calendar/gui/e-week-view.c:3180
 msgid "Delete All Occurrences"
 msgstr "Borrar todas las Ocurrencias"
 
@@ -2872,28 +2950,28 @@ msgstr "Borrar todas las Ocurrencias"
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/gnome-cal.c:216
+#: calendar/gui/gnome-cal.c:219
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: calendar/gui/gnome-cal.c:217
+#: calendar/gui/gnome-cal.c:220
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: calendar/gui/gnome-cal.c:218
+#: calendar/gui/gnome-cal.c:221
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/gnome-cal.c:219
+#: calendar/gui/gnome-cal.c:222
 msgid "Has category"
 msgstr "Tiene la categoría"
 
-#: calendar/gui/gnome-cal.c:1015
+#: calendar/gui/gnome-cal.c:1054
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:1026
+#: calendar/gui/gnome-cal.c:1065
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El método necesario para abrir `%s' no esta soportado"
@@ -3138,7 +3216,8 @@ msgstr "Vier"
 msgid "Sa"
 msgstr "Sab"
 
-#: calendar/gui/print.c:1847 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1847 shell/e-shortcuts.c:1002
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tareas"
 
@@ -3175,8 +3254,9 @@ msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
 #: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1603 ui/evolution-addressbook.xml.h:16
-#: ui/evolution-calendar.xml.h:24
+#: mail/mail-callbacks.c:1795 my-evolution/e-summary.c:452
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -3188,7 +3268,7 @@ msgstr "Imprimir Elemento"
 msgid "Print Setup"
 msgstr "Configurar impresión"
 
-#: calendar/gui/tasks-control.c:113
+#: calendar/gui/tasks-control.c:122
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrará la carpeta de tareas"
 
@@ -3282,31 +3362,31 @@ msgstr "time-day-end espera que el argumento 1 sea de tipo time_t"
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype espera 0 argumentos"
 
-#: calendar/pcs/query.c:472
+#: calendar/pcs/query.c:485
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? espera 2 argumentos"
 
-#: calendar/pcs/query.c:477
+#: calendar/pcs/query.c:490
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? espera que el argumento 1 sea de tipo time_t"
 
-#: calendar/pcs/query.c:484
+#: calendar/pcs/query.c:497
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? espera que el argumento 2 sea de tipo time_t"
 
-#: calendar/pcs/query.c:611
+#: calendar/pcs/query.c:627
 msgid "contains? expects 2 arguments"
 msgstr "contains? espera 2 argumentos"
 
-#: calendar/pcs/query.c:616
+#: calendar/pcs/query.c:632
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? espera que el argumento 1 sea una cadena"
 
-#: calendar/pcs/query.c:623
+#: calendar/pcs/query.c:639
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que el argumento 2 sea una cadena"
 
-#: calendar/pcs/query.c:640
+#: calendar/pcs/query.c:656
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -3314,15 +3394,15 @@ msgstr ""
 "contains? espera que el argumento 1 este entre \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:678
+#: calendar/pcs/query.c:694
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? espera al menos 1 argumento"
 
-#: calendar/pcs/query.c:684
+#: calendar/pcs/query.c:700
 msgid "has-categories? expects all arguments to be strings"
 msgstr "has-categories? espera que todos los argumentos sean cadenas"
 
-#: calendar/pcs/query.c:932
+#: calendar/pcs/query.c:948
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 "La evaluación de las expresiones de busqueda no devolvio un valor booleano"
@@ -3351,61 +3431,61 @@ msgstr "La desencriptación no está soportada por este cifrado"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en línea para competar esta operación"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-filter-driver.c:526 camel/camel-filter-driver.c:535
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:635
 msgid "Unable to open spool folder"
 msgstr "No pude abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:644
 msgid "Unable to process spool folder"
 msgstr "No pude procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:658
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:680
+#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
 #, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:663
 msgid "Cannot open message"
 msgstr "No puedo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:691 camel/camel-filter-driver.c:802
+#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:807
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
 msgid "Complete"
 msgstr "Completo"
 
-#: camel/camel-filter-driver.c:761
+#: camel/camel-filter-driver.c:753
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:766 camel/camel-filter-driver.c:784
+#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:876
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parseando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:890
+#: camel/camel-filter-driver.c:882
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-search.c:437 camel/camel-filter-search.c:444
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
@@ -3531,13 +3611,13 @@ msgid "No plaintext to sign."
 msgstr "No hay ningún texto plano a firmar"
 
 #: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:1060 camel/camel-pgp-context.c:1272
 msgid "No password provided."
 msgstr "No se dio contraseña"
 
 #: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1067
+#: camel/camel-pgp-context.c:1279
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "No pude comunicar con GPG/PGP: %s"
@@ -3555,15 +3635,15 @@ msgstr "No hay ningún texto plano a verificar."
 msgid "Couldn't create temp file: %s"
 msgstr "No pude crear archivo temporal: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1050
 msgid "No plaintext to encrypt."
 msgstr "No hay ningún texto plano a encriptar."
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1076
 msgid "No recipients specified"
 msgstr "No ha especificado destinatarios"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1264
 msgid "No ciphertext to decrypt."
 msgstr "No hay ningún texto cifrado a desencriptar."
 
@@ -3598,7 +3678,7 @@ msgid "Connection cancelled"
 msgstr "Conexión cancelada"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No pude conectar con %s (puerto %d): %s"
@@ -3840,8 +3920,8 @@ 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:1038 mail/mail-ops.c:1045
-#: mail/mail-ops.c:1063 mail/mail-ops.c:1064
+#: camel/camel-store.c:378 mail/mail-ops.c:987 mail/mail-ops.c:994
+#: mail/mail-ops.c:1012 mail/mail-ops.c:1013
 msgid "Trash"
 msgstr "Papelera"
 
@@ -3865,7 +3945,7 @@ msgstr ""
 "País: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:431 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3880,7 +3960,7 @@ msgstr ""
 "\n"
 "¿Quieres aceptarlo de todos modos?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-openssl.c:426
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -3931,41 +4011,40 @@ msgstr "Error desconocido"
 msgid "Server response ended too soon."
 msgstr "La respuesta del servidor terminó demasiado pronto."
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:493
 #, 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:526
+#: camel/providers/imap/camel-imap-command.c:530
 #, 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:188
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:207
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:267
+#: camel/providers/imap/camel-imap-folder.c:275
 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
+#: camel/providers/imap/camel-imap-folder.c:430
 msgid "Scanning IMAP folder"
 msgstr "Escaneando carpeta IMAP"
 
-#: camel/providers/imap/camel-imap-folder.c:1437
-#: camel/providers/imap/camel-imap-folder.c:1673
+#: camel/providers/imap/camel-imap-folder.c:1483
+#: camel/providers/imap/camel-imap-folder.c:1763
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:1465
-#: camel/providers/imap/camel-imap-folder.c:1706
+#: camel/providers/imap/camel-imap-folder.c:1796
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -3977,7 +4056,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:627
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:642
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -4015,7 +4094,7 @@ 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:471
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No hay soporte para el tipo de autenticación %s"
@@ -4026,7 +4105,7 @@ 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:510
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/smtp/camel-smtp-transport.c:411
 msgid "You didn't enter a password."
 msgstr "No escribió una clave."
 
@@ -4041,7 +4120,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:335
+#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
@@ -4303,7 +4382,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:1622
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1461
 msgid "Synchronising folder"
 msgstr "Sincronizando carpeta"
 
@@ -4376,34 +4455,34 @@ msgstr "No puedo abrir el directorio MH en la ruta: %s: %s"
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Por favor introduzca la contraseña NNTP para %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "El servidor rechazo el nombre de usuario"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Fallo al enviar el nombre de usuario al servidor"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "El servidor rechazo el nombre de usuario ó la contraseña"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Mensaje %s no encontrado."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "No pude obtener la lista de grupos del servidor."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "No pude cargar el archivo de listas de grupos para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "No pude guardar el archivo de listas de grupos para %s: %s"
@@ -4416,17 +4495,17 @@ msgstr "noticias USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Este es un proveedor para leer y enviar noticias a grupos de USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "No puedo abrir el directorio para el servidor de noticias: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Noticias USENET vía %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4434,8 +4513,8 @@ msgstr ""
 "Esta opción es para autentificarse con el servidor NNTP usando una "
 "contraseña de texto."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "No pude abrir o crear el archivo .newsrc para %s: %s"
@@ -4486,7 +4565,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:58
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
 msgid "POP"
 msgstr "POP"
 
@@ -4579,7 +4658,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:77
+#: mail/mail-config.glade.h:82
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4632,7 +4711,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:70
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:75
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4640,124 +4719,124 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Para enviar correo conectándose a un servidor de correo usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Error de sintaxis, comando no reconocido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Error de sintaxis en los parámetros o los argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Parámetro del comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Mensaje de ayuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Servicio cerrando los canales de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio no disponible, cerrando los canales de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Acción de correo requerida en orden, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "El usuario no es local: lo reenviaré a <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Acción solicitada del correo no realizada: el mailbox no está disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Acción solicitada no realizada: el mailbox no está disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Acción solicitada abortada: error en procesamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "El usuario no es local: por favor pruebe con <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Acción solicitada no realizada: la capacidad del sistema es insuficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Acción solicitada no realizada: excedió la capacidad de almacenamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Acción solicitada no realizada: nombre no permitido para mailbox"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Fallo en la transacción"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Es necesaria una transición de contraseña"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "El método de autenticación en demasiado debil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Encriptación requerida por el mecanismo de autenticación pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal en la autenticación"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Autenticación requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Mensaje de bienvenida erróneo: %s: posiblemente no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "El servidor SMTP %s no soporta el método de autenticación requerido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:396
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPor favor escriba la contraseña SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:419
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4768,116 +4847,116 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:535
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:537
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Envío de correo SMTP vía %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:562
 msgid "Cannot send message: sender address not defined."
 msgstr "No puedo enviar el mensaje: dirección del remitente no definida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:569
 msgid "Cannot send message: sender address not valid."
 msgstr "No puedo enviar el mensaje: dirección del remitente no válida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: no recipients defined."
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Expiró el tiempo para HELO: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:696
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Respuesta de error al HELO: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticación SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:744
+#: camel/providers/smtp/camel-smtp-transport.c:756
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Expiró el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:765
 msgid "AUTH request failed."
 msgstr "Error en la petición de AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Bad authentication response from server.\n"
 msgstr "Respuesta de autenticación errónea desde el servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:836
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:854
+#: camel/providers/smtp/camel-smtp-transport.c:855
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:899
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Respuesta de error a RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:930
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para DATA: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Respuesta de error a DATA: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:966
+#: camel/providers/smtp/camel-smtp-transport.c:984
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Expiró el tiempo para el envío de DATA: terminación del mensaje: %s: correo "
 "no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1003
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Respuesta de error a DATA: terminación del mensaje: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1027
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Expiró el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1046
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1069
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Expiró el tiempo para QUIT: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1088
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Respuesta de error a QUIT: %s: no es fatal"
@@ -4907,7 +4986,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:124
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
 msgid "attachment"
 msgstr "adjunto"
 
@@ -4939,30 +5018,48 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automaticamente"
 
-#: composer/e-msg-composer.c:635
+#: composer/e-msg-composer.c:667
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"No pude abrir el archivo de firma %s:\n"
+"No puedo abrir el archivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:808
+#: composer/e-msg-composer.c:680
+#, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+"Error cargando el archivo: %s:\n"
+"%s"
+
+#: composer/e-msg-composer.c:866
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:875
+#, fuzzy
+msgid "Warning!"
+msgstr "Aviso"
+
+#: composer/e-msg-composer.c:877
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:899
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:839
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:911
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4970,12 +5067,54 @@ 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:977 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1040
+#, c-format
+msgid "Error accessing file: %s"
+msgstr "Error accediendo al archivo: %s"
+
+#: composer/e-msg-composer.c:1048
+msgid "Unable to retrieve message from editor"
+msgstr "No pude obtener los mensajes del editor"
+
+#: composer/e-msg-composer.c:1054
+#, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"No pude buscar en el archivo: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1060
+#, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"No pude truncar el archivo: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1069
+#, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Error auto guardando el mensaje: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1146
+msgid ""
+"Evolution has detected an editor buffer from a previous session.\n"
+"Would you like to recover this buffer?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1299 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:231
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:1305
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4985,92 +5124,68 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1008
+#: composer/e-msg-composer.c:1330
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1167
-msgid "That file does not exist."
-msgstr "Ese archivo no existe."
-
-#: composer/e-msg-composer.c:1177
-msgid "That is not a regular file."
-msgstr "Ese no es un archivo normal."
-
-#: composer/e-msg-composer.c:1187
-msgid "That file exists but is not readable."
-msgstr "Ese archivo no es legible."
+#: composer/e-msg-composer.c:1479
+msgid "Insert File"
+msgstr "Insertar Archivo"
 
-#: composer/e-msg-composer.c:1197
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Ese archivo parece accesible pero open(2) ha fallado."
-
-#: composer/e-msg-composer.c:1219
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"El archivo es muy largo (más de 100K).\n"
-"¿Esta seguro que quiere añadirlo?"
-
-#: composer/e-msg-composer.c:1240
-msgid "An error occurred while reading the file."
-msgstr "Ha ocurrido un error mientras se leía el archivo."
-
-#: composer/e-msg-composer.c:1612 composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:1836 composer/e-msg-composer.c:2212
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2095
+#: composer/e-msg-composer.c:2306
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
-#: composer/e-msg-composer-hdrs.c:324
+#: composer/e-msg-composer-hdrs.c:325
 msgid "Click here for the address book"
 msgstr "Presione aquí para acceder a la agenda"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:355
+#: composer/e-msg-composer-hdrs.c:356
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:361
+#: composer/e-msg-composer-hdrs.c:362
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:372
+#: composer/e-msg-composer-hdrs.c:373
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:387
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:396
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5078,7 +5193,7 @@ msgstr ""
 "Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje."
 
-#: composer/evolution-composer.c:369
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -5086,7 +5201,7 @@ msgstr ""
 "No pude crear una ventana de composición, porque no ha configurado\n"
 "todavía ninguna identidad en el componente de correo."
 
-#: composer/evolution-composer.c:384
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "No puedo inicializar el componente de escritura correo de Evolution."
 
@@ -5105,7 +5220,7 @@ msgstr "información del calendario"
 #. strptime format for a date.
 #: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -5123,15 +5238,15 @@ msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
+#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
+#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
+#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
+#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -5289,8 +5404,8 @@ msgstr ""
 "Oops, te has olvidado de elegir una carpeta.\n"
 "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:690
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
+#: mail/mail-account-gui.c:701
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -5363,23 +5478,23 @@ msgstr "Nombre de la regla:"
 msgid "Untitled"
 msgstr "Sin título"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Ejecutar acciones"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "si se cumple algún criterio"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Añadir criterio"
 
@@ -5392,7 +5507,8 @@ msgid "outgoing"
 msgstr "saliente"
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Asignar color"
 
 #: filter/libfilter-i18n.h:4
@@ -5544,7 +5660,7 @@ msgstr "Respondido a"
 msgid "Score"
 msgstr "Puntuación"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1062
 msgid "Sender"
 msgstr "Remitente"
 
@@ -5553,39 +5669,43 @@ msgid "Set Status"
 msgstr "Poner estado"
 
 #: filter/libfilter-i18n.h:45
+msgid "Size (kB)"
+msgstr "Tamaño (kB)"
+
+#: filter/libfilter-i18n.h:46
 msgid "sounds like"
 msgstr "suena como"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "Source Account"
 msgstr "Fuente de la cuenta"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "Specific header"
 msgstr "Cabecera específica"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "starts with"
 msgstr "comienza por"
 
-#: filter/libfilter-i18n.h:49 mail/message-list.etspec.h:8
+#: filter/libfilter-i18n.h:50 mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Estado"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:776
+#: filter/libfilter-i18n.h:52 mail/mail-format.c:776
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "estaba después de"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "was before"
 msgstr "estaba antes de"
 
@@ -5605,29 +5725,29 @@ msgstr "Editar Regla"
 msgid "Score Rules"
 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
+#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:224
+#: importers/netscape-importer.c:769 importers/pine-importer.c:638
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importar"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:506 importers/netscape-importer.c:774
+#: importers/pine-importer.c:643
 msgid "Mail"
 msgstr "Correo"
 
-#: importers/elm-importer.c:521
+#: importers/elm-importer.c:510
 msgid "Elm Aliases"
 msgstr "Alias de Elm"
 
-#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
-#: importers/netscape-importer.c:807 importers/pine-importer.c:668
+#: importers/elm-importer.c:517 importers/evolution-gnomecard-importer.c:236
+#: importers/netscape-importer.c:796 importers/pine-importer.c:660
 #: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "No me preguntes más veces"
 
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:550
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5639,11 +5759,11 @@ msgstr ""
 msgid "Elm mail"
 msgstr "Correo de Elm"
 
-#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:653
 msgid "Addressbook"
 msgstr "Agenda de direcciones"
 
-#: importers/evolution-gnomecard-importer.c:275
+#: importers/evolution-gnomecard-importer.c:261
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5651,19 +5771,19 @@ msgstr ""
 "Evolution ha encontrado archivos de GnomeCard.\n"
 "¿Quiere importarlos a Evolution?"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:779 importers/pine-importer.c:648
 msgid "Settings"
 msgstr "Configuración"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1515
+#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1707
 msgid "Filters"
 msgstr "Filtros"
 
-#: importers/netscape-importer.c:800
+#: importers/netscape-importer.c:789
 msgid "Addressbooks"
 msgstr "Agenda de direcciones"
 
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:836
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5671,7 +5791,7 @@ msgstr ""
 "Evolution ha encontrado archivos de correo de Netscape.\n"
 "¿Quiere importarlos a Evolution?"
 
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:697
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5679,143 +5799,148 @@ msgstr ""
 "Evolution ha encontrado archivos de correo de Pine.\n"
 "¿Quiere importarlos a Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:725
 msgid "Pine mail"
 msgstr "Correo de Pine"
 
-#: mail/component-factory.c:622
+#: mail/component-factory.c:684
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:755
+#: mail/component-factory.c:818
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser.c:867
+#: mail/folder-browser.c:211 mail/mail-display.c:268
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "No puedo crear el directorio temporal: %s"
+
+#: mail/folder-browser.c:830
 msgid "Store search as vFolder"
 msgstr "Guardar la búsqueda como una carpeta virtual"
 
-#: mail/folder-browser.c:1209
+#: mail/folder-browser.c:1173
 msgid "VFolder on _Subject"
 msgstr "VFolder según el a_sunto"
 
-#: mail/folder-browser.c:1212
+#: mail/folder-browser.c:1176
 msgid "VFolder on Se_nder"
 msgstr "VFolder según el _remitente"
 
-#: mail/folder-browser.c:1215
+#: mail/folder-browser.c:1179
 msgid "VFolder on _Recipients"
 msgstr "VFolder según los _destinatarios"
 
-#: mail/folder-browser.c:1218
+#: mail/folder-browser.c:1182
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual según la _Lista de Correo"
 
-#: mail/folder-browser.c:1224
+#: mail/folder-browser.c:1188
 msgid "Filter on Sub_ject"
 msgstr "Filtrar según el As_unto"
 
-#: mail/folder-browser.c:1227
+#: mail/folder-browser.c:1191
 msgid "Filter on Sen_der"
 msgstr "Filtrar según el Re_mitente"
 
-#: mail/folder-browser.c:1230
+#: mail/folder-browser.c:1194
 msgid "Filter on Re_cipients"
 msgstr "Filtrar según los Des_tinatarios"
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1197
 msgid "Filter on _Mailing List"
 msgstr "Filtrar según la Lista de _Correo"
 
-#: mail/folder-browser.c:1242
+#: mail/folder-browser.c:1206
 msgid "_Open"
 msgstr "_Abrir"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1208
 msgid "Resend"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:1246 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:132 ui/evolution-tasks.xml.h:11
+#: mail/folder-browser.c:1210 ui/evolution-calendar.xml.h:54
+#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: mail/folder-browser.c:1248 ui/evolution-tasks.xml.h:10
+#: mail/folder-browser.c:1212 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1253 ui/evolution-mail.xml.h:131
+#: mail/folder-browser.c:1217 ui/evolution-mail-message.xml.h:85
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1255 ui/evolution-mail.xml.h:84
+#: mail/folder-browser.c:1219 ui/evolution-mail-message.xml.h:61
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1257 ui/evolution-mail.xml.h:83
+#: mail/folder-browser.c:1221 ui/evolution-mail-message.xml.h:60
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1223
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1226
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: mail/folder-browser.c:1264
+#: mail/folder-browser.c:1228
 msgid "Mark as U_nread"
 msgstr "Marcar como _no leído"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1233
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1271
+#: mail/folder-browser.c:1235
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail.xml.h:135
+#: mail/folder-browser.c:1239 ui/evolution-mail-message.xml.h:87
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:1285
+#: mail/folder-browser.c:1244
+msgid "Add Sender to Address Book"
+msgstr "Añadir Remitente a la Agenda de Direcciones"
+
+#: mail/folder-browser.c:1249
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:1289
+#: mail/folder-browser.c:1253
 msgid "Create Ru_le From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:1428
+#: mail/folder-browser.c:1392
 msgid "Filter on Mailing List"
 msgstr "Filtrar según la lista de correo"
 
-#: mail/folder-browser.c:1429
+#: mail/folder-browser.c:1393
 msgid "VFolder on Mailing List"
 msgstr "Carpeta virtual según la Lista de Correo"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1395
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar según la lista de correo (%s)"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1396
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Carpeta virtual según la Lista de Correo (%s)"
 
-#: mail/folder-browser-factory.c:215
+#: mail/folder-browser-ui.c:253
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para \"%s\""
 
-#: mail/folder-browser-factory.c:217
+#: mail/folder-browser-ui.c:255
 msgid "Properties"
 msgstr "Propiedades"
 
@@ -5915,28 +6040,42 @@ msgstr "No ha rellenado toda la información requerida."
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-accounts.c:126 mail/mail-accounts.c:177
+#: mail/mail-account-gui.c:891
+msgid "Save signature"
+msgstr "Guardar firma"
+
+#: mail/mail-account-gui.c:897
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta firma ha cambiado, pero no ha sido guardada.\n"
+"\n"
+"¿Quiere guardar los cambios?"
+
+#: mail/mail-accounts.c:130
 msgid " (default)"
 msgstr "(valores predeterminados)"
 
-#: mail/mail-accounts.c:209
+#: mail/mail-accounts.c:169
 msgid "Disable"
 msgstr "Deshabilitado"
 
-#: mail/mail-accounts.c:211 mail/mail-config.glade.h:35
+#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
 msgid "Enable"
 msgstr "Habilitado"
 
-#: mail/mail-accounts.c:299 mail/mail-accounts.c:303
+#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Esta seguro que quiere borrar esta cuenta?"
 
-#: mail/mail-accounts.c:463 mail/mail-accounts.c:467
+#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
 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:650
+#: mail/mail-accounts.c:703
 msgid "Evolution Account Manager"
 msgstr "Administrador de cuentas de Evolution"
 
@@ -5964,7 +6103,7 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Añadir Regla de Filtro"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5976,7 +6115,7 @@ msgstr ""
 "recibir o escribir mensajes.\n"
 "¿Querría configurarlo ahora?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5984,7 +6123,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5992,11 +6131,11 @@ msgstr ""
 "Necesita configurar un transporte de\n"
 "correo para poder enviarlo."
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "No has definido un sistema para enviar el correo"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6004,37 +6143,45 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "¿Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:319
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:362
+#: mail/mail-callbacks.c:410
 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:616
+#: mail/mail-callbacks.c:655
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "El día %s, %s escribió:"
 
-#: mail/mail-callbacks.c:836
+#: mail/mail-callbacks.c:887
 msgid "Forwarded message:\n"
 msgstr "Mensaje reenviado:\n"
 
-#: mail/mail-callbacks.c:930
+#: mail/mail-callbacks.c:981
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:932
+#: mail/mail-callbacks.c:983
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:1147
+#: mail/mail-callbacks.c:1338
 #, 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:1169
+#: mail/mail-callbacks.c:1360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6042,7 +6189,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:1203
+#: mail/mail-callbacks.c:1394
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6050,20 +6197,20 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:1215
+#: mail/mail-callbacks.c:1406
 #, 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:1236
+#: mail/mail-callbacks.c:1427
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:1270 mail/mail-display.c:94
+#: mail/mail-callbacks.c:1461 mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:1274 mail/mail-display.c:98
+#: mail/mail-callbacks.c:1465 mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -6071,15 +6218,15 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Sobreescribirlo?"
 
-#: mail/mail-callbacks.c:1318
+#: mail/mail-callbacks.c:1509
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:1320
+#: mail/mail-callbacks.c:1511
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:1505
+#: mail/mail-callbacks.c:1697
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6088,20 +6235,20 @@ msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1563
+#: mail/mail-callbacks.c:1755
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:1610
+#: mail/mail-callbacks.c:1802
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresión del mensaje"
 
-#: mail/mail-callbacks.c:1705
+#: mail/mail-callbacks.c:1897
 #, 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:1448 mail/mail-config.c:1451
+#: mail/mail-config.c:1540 mail/mail-config.c:1543
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -6246,10 +6393,6 @@ msgstr "Juego de caracteres por defecto: "
 msgid "Digital IDs..."
 msgstr "ID digitales..."
 
-#: mail/mail-config.glade.h:29
-msgid "Display"
-msgstr "Mostrar"
-
 #: mail/mail-config.glade.h:30
 msgid "Done"
 msgstr "Hecho"
@@ -6262,187 +6405,221 @@ msgstr "Borradores"
 msgid "Drafts folder:"
 msgstr "Carpeta de borradores:"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Editar..."
+
+#: mail/mail-config.glade.h:35
 msgid "Email Address:"
 msgstr "Dirección de correo:"
 
 #: mail/mail-config.glade.h:36
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Get Digital ID..."
 msgstr "Obtener ID digital..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
+msgid "HTML Signature:"
+msgstr "Firma en HTML:"
+
+#: mail/mail-config.glade.h:41
 msgid "Highlight citations with"
 msgstr "Resaltadar citas con"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:45
 msgid "In HTML mail"
 msgstr "Correo en HTML"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Inline"
 msgstr "Incluido en línea"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:48
 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:46
+#: mail/mail-config.glade.h:49
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:50
 msgid "Make this my default account"
 msgstr "Hacer de esta mi cuenta predeterminada"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:51
 msgid "Mark messages as \"Read\" after:"
 msgstr "Marcar mensajes como \"Leídos\" tras:"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
+msgid "NNTP Server:"
+msgstr "Servidor NNTP:"
+
+#: mail/mail-config.glade.h:54
 msgid "Never load images off the net"
 msgstr "No cargar nunca imágenes desde la red"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:55
 msgid "News"
 msgstr "Noticias"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:57
 msgid "Optional Information"
 msgstr "Información Opcional"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:58
 msgid "Organization:"
 msgstr "Organización:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:60
 msgid "PGP Key ID:"
 msgstr "ID de la clave PGP:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:61
 msgid "PGP binary path:"
 msgstr "Localización del binario de PGP:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
+msgid "Pick a color"
+msgstr "Elije un color"
+
+#: mail/mail-config.glade.h:66
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Crear una regla para filtrar los mensajes con este asunto"
+
+#: mail/mail-config.glade.h:68
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:69
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:70
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:71
 msgid "Receiving Mail"
 msgstr "Recibiendo Mensajes"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:72
 msgid "Receiving Options"
 msgstr "Recibiendo Opciones"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:74
 msgid "Required Information"
 msgstr "Información Requerida"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:76
 msgid "Secure MIME"
 msgstr "MIME seguro"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:77
 msgid "Security"
 msgstr "Seguridad"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:78
 msgid "Select PGP binary"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:79
 msgid "Send mail in HTML format by default."
 msgstr "Enviar por defecto el mensaje en formato HTML"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:80
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:81
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:83
 msgid "Sent"
 msgstr "Enviado"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:84
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:85
 msgid "Sent messages folder:"
 msgstr "Carpeta de mensajes enviados:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:86
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:87
 msgid "Server Type: "
 msgstr "Tipo de servidor:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:88
 msgid "Server requires authentication"
 msgstr "El servidor requiere autentificación"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:89
 msgid "Signature file:"
 msgstr "Archivo de firma:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:90
+msgid "Source"
+msgstr "Fuente"
+
+#: mail/mail-config.glade.h:91
+msgid "Source Information"
+msgstr "Información de la Fuente"
+
+#: mail/mail-config.glade.h:92
 msgid "Sources"
 msgstr "Fuentes"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:93
 msgid "Special Folders"
 msgstr "Carpetas Especiales"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:94
 msgid "Standard Unix mbox"
 msgstr "Mabox estándar de Unix"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:95
 msgid "Type"
 msgstr "Tipo"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:96
 msgid "Use secure connection (SSL)"
 msgstr "Use conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:97
 msgid "Username:"
 msgstr "Nombre:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:98
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6452,15 +6629,25 @@ msgstr ""
 "\n"
 "Pulse \"Siguiente\" para comenzar. "
 
-#: mail/mail-config.glade.h:96 ui/evolution-message-composer.xml.h:47
-#: ui/evolution-subscribe.xml.h:10 ui/evolution.xml.h:48
+#: mail/mail-config.glade.h:103 ui/evolution-comp-editor.xml.h:20
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
 msgid "_Edit"
 msgstr "_Editar"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:105
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:106
 msgid "placeholder"
 msgstr "placeholder"
 
+#: mail/mail-config.glade.h:107
+msgid "seconds."
+msgstr "segundos."
+
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "No pude crear un contexto de firma PGP."
@@ -6497,56 +6684,55 @@ msgstr "No pude crear un contexto sobre tipo S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "No pude crear un contexto de decodificación S/MIME."
 
-#: mail/mail-display.c:198
+#: mail/mail-display.c:220
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:238
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "No puedo crear el directorio temporal: %s"
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:330
 msgid "Save to Disk..."
 msgstr "Guardar en disco..."
 
-#: mail/mail-display.c:301
+#: mail/mail-display.c:332
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:303
+#: mail/mail-display.c:334
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:369
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:392
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (vía %s)"
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:396
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:990
+#: mail/mail-display.c:1028
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1283
-msgid "Open link in browser"
-msgstr "Abrir enlaze en el navegador"
+#: mail/mail-display.c:1371
+msgid "Open Link in Browser"
+msgstr "Abrir Enlaze en el Navegador"
+
+#: mail/mail-display.c:1373
+msgid "Copy Link Location"
+msgstr "Copiar Dirección del Enlaze"
 
-#: mail/mail-display.c:1285
-msgid "Save as (FIXME)"
-msgstr "Guardar como (ARREGLAME)"
+#: mail/mail-display.c:1375
+msgid "Save Link as (FIXME)"
+msgstr "Guardar Enlaze como (ARREGLAME)"
 
-#: mail/mail-display.c:1287
-msgid "Copy location (FIXME)"
-msgstr "Copiar dirección (ARREGLAME)"
+#: mail/mail-display.c:1377
+msgid "Save Image as"
+msgstr "Guardar Imagen como..."
 
 #: mail/mail-format.c:532
 #, c-format
@@ -6627,43 +6813,43 @@ msgstr "Puntero a datos externos desconocidos (tipo \"%s\")"
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:506
+#: mail/mail-local.c:455
 #, c-format
 msgid "Opening '%s'"
 msgstr "Abriendo '%s'"
 
-#: mail/mail-local.c:805
+#: mail/mail-local.c:755
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta \"%s\" al formato \"%s\""
 
-#: mail/mail-local.c:809
+#: mail/mail-local.c:759
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar la carpeta \"%s\" al formato \"%s\""
 
-#: mail/mail-local.c:832
+#: mail/mail-local.c:782
 msgid "Reconfiguring folder"
 msgstr "Reconfigurar carpeta"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:861
+#: mail/mail-local.c:811
 msgid "Closing current folder"
 msgstr "Cerrando carpeta actual"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:838
 msgid "Renaming old folder and opening"
 msgstr "Renombrando carpeta antigua y abriéndola"
 
-#: mail/mail-local.c:911
+#: mail/mail-local.c:856
 msgid "Creating new folder"
 msgstr "Creando una nueva carpeta"
 
-#: mail/mail-local.c:925
+#: mail/mail-local.c:870
 msgid "Copying messages"
 msgstr "Copiando mensajes"
 
-#: mail/mail-local.c:942
+#: mail/mail-local.c:887
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6672,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:981
+#: mail/mail-local.c:926
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6680,7 +6866,7 @@ msgstr ""
 "Si no puede volver a abrir este buzón, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1012
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Reconfigurar %s"
@@ -6703,120 +6889,110 @@ msgstr ""
 "Error mientras hacia:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-mt.c:862
+#: mail/mail-mt.c:867
 msgid "Evolution progress"
 msgstr "Progreso de Evolution"
 
-#: mail/mail-ops.c:625
+#: mail/mail-ops.c:556
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:560
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: mail/mail-ops.c:744
+#: mail/mail-ops.c:676
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:763
+#: mail/mail-ops.c:695
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:765 mail/mail-send-recv.c:491
+#: mail/mail-ops.c:697 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:851
+#: mail/mail-ops.c:783
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:926
+#: mail/mail-ops.c:862
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:926
+#: mail/mail-ops.c:862
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:879
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:946
+#: mail/mail-ops.c:882
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1023
+#: mail/mail-ops.c:972
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en \"%s\""
 
-#: mail/mail-ops.c:1185
+#: mail/mail-ops.c:1134
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1226 mail/mail-ops.c:1364
+#: mail/mail-ops.c:1175 mail/mail-ops.c:1313
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1293
+#: mail/mail-ops.c:1242
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1381
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1519
-#, c-format
-msgid "Moving folder %s to %s"
-msgstr "Moviendo la carpeta %s a %s"
-
-#: mail/mail-ops.c:1521
-#, c-format
-msgid "Copying folder %s to %s"
-msgstr "Copiando carpeta %s a %s"
-
-#: mail/mail-ops.c:1674
+#: mail/mail-ops.c:1513
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1710
+#: mail/mail-ops.c:1549
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1759
+#: mail/mail-ops.c:1598
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1826
+#: mail/mail-ops.c:1665
 msgid "Retrieving messages"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:1836
+#: mail/mail-ops.c:1675
 #, 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:1910
+#: mail/mail-ops.c:1749
 msgid "Saving messages"
 msgstr "Guardando mensajes"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:1828
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6825,12 +7001,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2002
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Guardando mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:1855
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6839,11 +7015,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2090
+#: mail/mail-ops.c:1929
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2105
+#: mail/mail-ops.c:1944
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6852,12 +7028,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:1972
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2200
+#: mail/mail-ops.c:2039
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
@@ -6886,62 +7062,58 @@ msgstr "Buscar:"
 msgid "Matches:"
 msgstr "Coincide:"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Buscar"
-
-#: mail/mail-send-recv.c:142
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Enviar & Recibir mensajes"
 
-#: mail/mail-send-recv.c:252
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Recibiendo"
 
-#: mail/mail-send-recv.c:301
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:303 mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-send-recv.c:322
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Enviando"
 
-#: mail/mail-send-recv.c:487
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Cancelado"
 
-#: mail/mail-tools.c:157
+#: mail/mail-tools.c:159
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No puedo crear el mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:205
+#: mail/mail-tools.c:207
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaje reenviado)"
 
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:217
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sin asunto)"
 
-#: mail/mail-tools.c:232
+#: mail/mail-tools.c:234
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:234
+#: mail/mail-tools.c:236
 msgid "Forwarded message (no subject)"
 msgstr "Mensaje reenviado (sin asunto)"
 
-#: mail/mail-tools.c:447
+#: mail/mail-tools.c:457
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
@@ -6950,65 +7122,14 @@ msgstr ""
 "-----Mensaje Reenviado-----<br><b>De:</b> %s<br><b>A:</b> %s<br><b>Asunto:</"
 "b> %s<br>"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:250
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:442
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:197 ui/evolution-mail.xml.h:81
-msgid "Reply"
-msgstr "Responder"
-
-#: mail/message-browser.c:197
-msgid "Reply to the sender of this message"
-msgstr "Responder al remitente de este mensaje"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:82
-msgid "Reply to All"
-msgstr "Re: Todos"
-
-#: 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:203 ui/evolution-mail.xml.h:42
-msgid "Forward"
-msgstr "Reenviar"
-
-#: mail/message-browser.c:203
-msgid "Forward this message"
-msgstr "Reenviar este mensaje"
-
-#: mail/message-browser.c:208
-msgid "Print the selected message"
-msgstr "Imprimir el mensaje seleccionado"
-
-#: mail/message-browser.c:211
-msgid "Delete this message"
-msgstr "Borrar este mensaje"
-
-#: mail/message-browser.c:216 ui/evolution-mail.xml.h:75
-msgid "Previous"
-msgstr "Previo"
-
-#: mail/message-browser.c:216
-msgid "Previous message"
-msgstr "Mensaje previo"
-
-#: mail/message-browser.c:219 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:66
-msgid "Next"
-msgstr "Siguiente"
-
-#: mail/message-browser.c:219
-msgid "Next message"
-msgstr "Mensaje siguiente"
-
 #: mail/message-list.c:608
 msgid "Unseen"
 msgstr "Sin leer"
@@ -7081,7 +7202,7 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
-#: mail/mail-session.c:161
+#: mail/mail-session.c:170
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
@@ -7113,10 +7234,1251 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Dessuscribiendo la carpeta \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Administrar Suscripciones"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Componente Evolution para el resumen de trabajo."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Factoría para el componente resumen de trabajo de Evolution."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "No puedo inicializar el componente de resumen de trabajo de Evolution."
+
+#: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
+msgid "Appointments"
+msgstr "Citas"
+
+#: my-evolution/e-summary-calendar.c:159
+msgid "No appointments"
+msgstr "Sin citas"
+
+#: my-evolution/e-summary-calendar.c:203 my-evolution/e-summary-calendar.c:209
+msgid "%I:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-mail.c:100
+msgid "Mail summary"
+msgstr "Resumen de correo"
+
+#: my-evolution/e-summary-rdf.c:378 my-evolution/e-summary-rdf.c:404
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Error obteniendo RDF</b>"
+
+#: my-evolution/e-summary-weather.c:56
+msgid "My Weather"
+msgstr "Mi Tiempo"
+
+#: my-evolution/e-summary-weather.c:296
+msgid "<b>Error downloading Metar</b>"
+msgstr "<b>Error obteniendo Metar</b>"
+
+#: my-evolution/e-summary-weather.c:612
+msgid "Regions"
+msgstr "Regiones"
+
+#: my-evolution/e-summary.c:413 ui/my-evolution.xml.h:3
+msgid "Print My Evolution"
+msgstr "Imprimir Mi Evolution"
+
+#: my-evolution/e-summary.c:459
+msgid "Printing of My Evolution failed"
+msgstr "La impresión de Mi Evolution ha fallado"
+
+#: my-evolution/main.c:52
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "El componente de resumen de trabajo no pudo inicializar Bonobo.\n"
+
+#: my-evolution/metar.c:43
+msgid "Clear sky"
+msgstr "Cielo claro"
+
+#: my-evolution/metar.c:44
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:45
+msgid "Scattered clouds"
+msgstr "Nubes dispersas"
+
+#: my-evolution/metar.c:46
+msgid "Few clouds"
+msgstr "Algun nube"
+
+#: my-evolution/metar.c:47
+msgid "Overcast"
+msgstr "Cubierto"
+
+#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
+msgid "Invalid"
+msgstr "Inválido"
+
+#: my-evolution/metar.c:62
+msgid "Variable"
+msgstr "Variable"
+
+#: my-evolution/metar.c:63
+msgid "North"
+msgstr "Norte"
+
+#: my-evolution/metar.c:63
+msgid "North - NorthEast"
+msgstr "Norte - Noreste"
+
+#: my-evolution/metar.c:63
+msgid "Northeast"
+msgstr "Noreste"
+
+#: my-evolution/metar.c:63
+msgid "East - NorthEast"
+msgstr "Este - Noreste"
+
+#: my-evolution/metar.c:64
+msgid "East"
+msgstr "Este"
+
+#: my-evolution/metar.c:64
+msgid "East - Southeast"
+msgstr "Este - Sureste"
+
+#: my-evolution/metar.c:64
+msgid "Southeast"
+msgstr "Sureste"
+
+#: my-evolution/metar.c:64
+msgid "South - Southeast"
+msgstr "Sur - Sureste"
+
+#: my-evolution/metar.c:65
+msgid "South"
+msgstr "Sur"
+
+#: my-evolution/metar.c:65
+msgid "South - Southwest"
+msgstr "Sur - Suroeste"
+
+#: my-evolution/metar.c:65
+msgid "Southwest"
+msgstr "Suroeste"
+
+#: my-evolution/metar.c:65
+msgid "West - Southwest"
+msgstr "Oeste - Suroeste"
+
+#: my-evolution/metar.c:66
+msgid "West"
+msgstr "Oeste"
+
+#: my-evolution/metar.c:66
+msgid "West - Northwest"
+msgstr "Oeste - Noroeste"
+
+#: my-evolution/metar.c:66
+msgid "Northwest"
+msgstr "Noroeste"
+
+#: my-evolution/metar.c:66
+msgid "North - Northwest"
+msgstr "Norte - Noroeste"
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:99
+msgid "Drizzle"
+msgstr "Llovizna"
+
+#: my-evolution/metar.c:99
+msgid "Drizzle in the vicinity"
+msgstr "Llovizna en las proximidades"
+
+#: my-evolution/metar.c:99
+msgid "Light drizzle"
+msgstr "Ligera llovizna"
+
+#: my-evolution/metar.c:99
+msgid "Moderate drizzle"
+msgstr "Llovizna moderada"
+
+#: my-evolution/metar.c:99
+msgid "Heavy drizzle"
+msgstr "Fuerte Llovizna"
+
+#: my-evolution/metar.c:99
+msgid "Shallow drizzle"
+msgstr "Llovizna suave"
+
+#: my-evolution/metar.c:99
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:99
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:99 my-evolution/metar.c:100
+msgid "Thunderstorm"
+msgstr "Tormenta"
+
+#: my-evolution/metar.c:99
+msgid "Windy drizzle"
+msgstr "Llovizna ventosa"
+
+#: my-evolution/metar.c:99
+msgid "Showers"
+msgstr "Chaparrones"
+
+#: my-evolution/metar.c:99
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:99
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:100
+msgid "Rain"
+msgstr "Lluvia"
+
+#: my-evolution/metar.c:100
+msgid "Rain in the vicinity"
+msgstr "Lluvia en las proximidades"
+
+#: my-evolution/metar.c:100
+msgid "Light rain"
+msgstr "Lluvia suave"
+
+#: my-evolution/metar.c:100
+msgid "Moderate rain"
+msgstr "Lluvia moderada"
+
+#: my-evolution/metar.c:100
+msgid "Heavy rain"
+msgstr "Lluvia fuerte"
+
+#: my-evolution/metar.c:100
+msgid "Shallow rain"
+msgstr "Lluvia suave"
+
+#: my-evolution/metar.c:100
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Drifting rain"
+msgstr "La descripción contiene"
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Buscar de nuevo"
+
+#. SNOW
+#: my-evolution/metar.c:101
+msgid "Snow"
+msgstr "Nieve"
+
+#: my-evolution/metar.c:101
+msgid "Snow in the vicinity"
+msgstr "Nevadas en las proximidades"
+
+#: my-evolution/metar.c:101
+msgid "Light snow"
+msgstr "Ligera nevada"
+
+#: my-evolution/metar.c:101
+msgid "Moderate snow"
+msgstr "Nevada moderada"
+
+#: my-evolution/metar.c:101
+msgid "Heavy snow"
+msgstr "Nevada fuerte"
+
+#: my-evolution/metar.c:101
+msgid "Shallow snow"
+msgstr "Nevada suave"
+
+#: my-evolution/metar.c:101
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:101 my-evolution/metar.c:102
+msgid "Snowstorm"
+msgstr "Tormenta de nieve"
+
+#: my-evolution/metar.c:101
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:102
+msgid "Snow grains"
+msgstr "Granizada"
+
+#: my-evolution/metar.c:102
+msgid "Snow grains in the vicinity"
+msgstr "Granizada en las proximidades"
+
+#: my-evolution/metar.c:102
+msgid "Light snow grains"
+msgstr "Ligera granizada"
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow grains"
+msgstr "Granizada moderada"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow grains"
+msgstr "Fuerte granizada"
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow grains"
+msgstr "Granizada suave"
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "La descripción contiene"
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:103
+msgid "Ice crystals"
+msgstr "Helada"
+
+#: my-evolution/metar.c:103
+msgid "Ice crystals in the vicinity"
+msgstr "Heladas en las proximidades"
+
+#: my-evolution/metar.c:103
+msgid "Few ice crystals"
+msgstr "Algunas placas de hielo"
+
+#: my-evolution/metar.c:103
+msgid "Moderate ice crystals"
+msgstr "Helada moderada"
+
+#: my-evolution/metar.c:103
+msgid "Heavy ice crystals"
+msgstr "Helada intensa"
+
+#: my-evolution/metar.c:103
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial ice crystals"
+msgstr "Helada parcial"
+
+#: my-evolution/metar.c:103
+msgid "Ice crystal storm"
+msgstr "Tormenta de hielo"
+
+#: my-evolution/metar.c:103
+msgid "Blowing ice crystals"
+msgstr "Ventisca de hielo"
+
+#: my-evolution/metar.c:103
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:104
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:105
+#, fuzzy
+msgid "Hail"
+msgstr "Correo"
+
+#: my-evolution/metar.c:105
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105 my-evolution/metar.c:106
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:105
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Mostrar todo "
+
+#: my-evolution/metar.c:105
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:105
+#, fuzzy
+msgid "Partial hail"
+msgstr "Correo electrónico principal"
+
+#: my-evolution/metar.c:105
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:105
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Recibiendo Mensajes"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:106
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Mostrar todo "
+
+#: my-evolution/metar.c:106
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Mostrar todo "
+
+#: my-evolution/metar.c:106
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Estado de la autenticación desconocido."
+
+#: my-evolution/metar.c:107
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Light precipitation"
+msgstr "Resaltadar citas con"
+
+#: my-evolution/metar.c:107
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Error desconocido"
+
+#: my-evolution/metar.c:107
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Invitaciones para la reunión"
+
+#. MIST
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Mist"
+msgstr "Señorita"
+
+#: my-evolution/metar.c:108
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Partial mist"
+msgstr "Vertical"
+
+#: my-evolution/metar.c:108
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Lista de correo"
+
+#: my-evolution/metar.c:108
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:109
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Mostrar todo "
+
+#: my-evolution/metar.c:109
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Cerrar esta ventana"
+
+#: my-evolution/metar.c:109
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Smoke"
+msgstr "Almacenar"
+
+#: my-evolution/metar.c:110
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Mostrar tareas"
+
+#: my-evolution/metar.c:110
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Cerrar esta ventana"
+
+#: my-evolution/metar.c:110
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:111
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:112
+#, fuzzy
+msgid "Sand"
+msgstr "Enviar"
+
+#: my-evolution/metar.c:112
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Haze"
+msgstr "Cabecera"
+
+#: my-evolution/metar.c:113
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Sprays"
+msgstr "días"
+
+#: my-evolution/metar.c:114
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Dust"
+msgstr "Agosto"
+
+#: my-evolution/metar.c:115
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:116
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:117
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:118
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:119
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:120
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:120
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Cosas por hacer"
+
+#: my-evolution/metar.c:120
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:120
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Cosas por hacer"
+
+#: my-evolution/metar.c:120
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:121
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: shell/e-activity-handler.c:198
+msgid "Show Details"
+msgstr "Mostrar Detalles"
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr "Cancelar Operación"
+
 #: shell/e-setup.c:125 shell/e-setup.c:198
 msgid "Evolution installation"
 msgstr "Instalación de Evolution"
@@ -7209,12 +8571,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:372
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1197
+#: shell/e-shell.c:1308
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7223,37 +8585,53 @@ 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:242
+#: shell/e-shell-folder-commands.c:159
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "No pude acceder a la carpeta: %s: %s"
+
+#: shell/e-shell-folder-commands.c:161
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"No puedo copiar archivos en\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:175
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:269
 #, 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:247
+#: shell/e-shell-folder-commands.c:274
 msgid "Copy folder"
 msgstr "Copiar una carpeta"
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:312
 #, 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:290
+#: shell/e-shell-folder-commands.c:317
 msgid "Move folder"
 msgstr "Mover una carpeta"
 
 #. Popup a dialog asking if they are sure they want to delete
 #. the folder
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:351
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Borrar carpeta '%s'"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "¿Esta seguro que quiere borrar la carpeta `%s'?"
 
-#: shell/e-shell-folder-commands.c:390
+#: shell/e-shell-folder-commands.c:417
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Renombrar carpeta '%s'"
@@ -7275,7 +8653,7 @@ msgstr "El nombre de carpeta especificado no es valido."
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear nuevas carpetas"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7283,7 +8661,7 @@ msgstr ""
 "El tipo de carpeta seleccionada no es valido para\n"
 "la operación requerida."
 
-#: shell/e-shell-folder-selection-dialog.c:329
+#: shell/e-shell-folder-selection-dialog.c:332
 msgid "New..."
 msgstr "Nuevo..."
 
@@ -7395,35 +8773,35 @@ msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
-#: shell/e-shell-view.c:170
+#: shell/e-shell-view.c:173
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrándose)"
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1368
+#: shell/e-shell-view.c:1386 shell/e-storage-set-view.c:1441
 msgid "My Evolution"
 msgstr "Mi Evolution"
 
-#: shell/e-shell-view.c:1385
+#: shell/e-shell-view.c:1403
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1387
+#: shell/e-shell-view.c:1405
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1425
+#: shell/e-shell-view.c:1443
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution está conectado.  Pulse este botón para trabajar desconectado."
 
-#: shell/e-shell-view.c:1432
+#: shell/e-shell-view.c:1450
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1438
+#: shell/e-shell-view.c:1456
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution está desconectado.  Pulse este botón para trabajar conectado."
@@ -7450,35 +8828,55 @@ 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:468
+#: shell/e-shell-view-menu.c:453
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:469
+#: shell/e-shell-view-menu.c:454
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:655
+#: shell/e-shell-view-menu.c:599
+msgid "Create a new shortcut"
+msgstr "Crear un nuevo atajo"
+
+#: shell/e-shell-view-menu.c:600
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "Seleccione la carpeta a la que quiere que apunte el atajo:"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work online"
 msgstr "Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:667 shell/e-shell-view-menu.c:679
+#: shell/e-shell-view-menu.c:717 shell/e-shell-view-menu.c:729
 msgid "Work offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shortcuts.c:382
+#: shell/e-shortcuts.c:601
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts.c:998
+msgid "Shortcuts"
+msgstr "Atajos"
+
+#: shell/e-shortcuts.c:1000
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-shortcuts.c:1003
+msgid "Contacts"
+msgstr "Contactos"
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nombre del grupo:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7487,59 +8885,98 @@ msgstr ""
 "¿Realmente quiere quitar el grupo\n"
 "`%s' del menú de atajos?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "No quitar"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:297
+msgid "Rename Shortcut Group"
+msgstr "Renombrar Grupo de Atajos"
+
+#: shell/e-shortcuts-view.c:298
+msgid "Rename selected shortcut group to:"
+msgstr "Renombrar grupos de atajos seleccionados a:"
+
+#: shell/e-shortcuts-view.c:308
 msgid "_Small Icons"
 msgstr "Icono_s pequeños"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:309
 msgid "Show the shortcuts as small icons"
 msgstr "Mostrar los atajos como iconos pequeños"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:311
 msgid "_Large Icons"
 msgstr "Iconos _grandes"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:312
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar los atajos como iconos grandes"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:323
 msgid "_New Group..."
 msgstr "_Nuevo grupo..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:324
 msgid "Create a new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:294
+#: shell/e-shortcuts-view.c:326
 msgid "_Remove This Group..."
 msgstr "_Quitar este grupo..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:327
 msgid "Remove this shortcut group"
 msgstr "Quitar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:329
+msgid "Re_name This Group..."
+msgstr "Re_nombrar Este Grupo..."
+
+#: shell/e-shortcuts-view.c:330
+msgid "Rename this shortcut group"
+msgstr "Renombrar este grupo de atajos"
+
+#: shell/e-shortcuts-view.c:335
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:336
 msgid "Hide the shortcut bar"
 msgstr "Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Activar"
+#: shell/e-shortcuts-view.c:455
+msgid "Rename shortcut"
+msgstr "Renombrar atajo"
+
+#: shell/e-shortcuts-view.c:456
+msgid "Rename selected shortcut to:"
+msgstr "Renombrar atajos seleccionados a:"
+
+#: shell/e-shortcuts-view.c:468
+msgid "Open the folder linked to this shortcut"
+msgstr "Abrir la carpeta enlazada a este atajo"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Activar este atajo"
+#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Abrir en una nueva ventana"
+
+#: shell/e-shortcuts-view.c:470
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Abrir el mensaje seleccionado en una nueva ventana"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:473
+#, fuzzy
+msgid "Rename"
+msgstr "_Renombrar..."
+
+#: shell/e-shortcuts-view.c:473
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Quitar este grupo de atajos"
+
+#: shell/e-shortcuts-view.c:475
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
@@ -7591,6 +9028,16 @@ msgstr "Operación no soportada"
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no esta soportado por este manejador"
 
+#: shell/e-task-widget.c:167
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:172
+#, fuzzy, c-format
+msgid "%s (%d%% complete)"
+msgstr "(Completado "
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nombre de la carpeta:"
@@ -7638,21 +9085,17 @@ msgid "Don't import"
 msgstr "No importar"
 
 #: shell/main.c:89
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7675,7 +9118,7 @@ msgstr ""
 "Esperamos que le gusten los resultados de nuestro duro trabajo, y\n"
 "esperamos sus contribuciónes\n"
 
-#: shell/main.c:114
+#: shell/main.c:110
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7683,27 +9126,29 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: shell/main.c:145
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:148
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "No puedo inicializar la shell de Evolution."
 
-#: shell/main.c:191
+#: shell/main.c:208
 msgid "Disable splash screen"
 msgstr "Desahilitar pantalla de entrada"
 
-#: shell/main.c:192
+#: shell/main.c:209
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar la salida de depurado de todos los componente a un archivo."
 
-#: shell/main.c:224
+#: shell/main.c:244
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: ui/evolution-addressbook.xml.h:3
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
 msgid "Copy the selection"
 msgstr "Copiar la selección"
 
@@ -7715,7 +9160,7 @@ msgstr "Crear nuevo contacto"
 msgid "Create new contact list"
 msgstr "Crear nueva lista de contactos"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
 msgid "Cut the selection"
 msgstr "Cortar la selección"
 
@@ -7731,7 +9176,7 @@ msgstr "Nuevo contacto"
 msgid "New list"
 msgstr "Nueva lista"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
 msgid "Paste the clipboard"
 msgstr "Pegar el contenido del porta papeles"
 
@@ -7771,17 +9216,19 @@ msgstr "_Contacto"
 msgid "_Contact Group"
 msgstr "_Contactar con el Grupo"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
 #: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Im_primir..."
 
@@ -7793,8 +9240,8 @@ msgstr "Bu_scar contactos"
 msgid "_Select All"
 msgstr "_Seleccionar todo"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:44
-#: ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Herramientas"
 
@@ -7802,143 +9249,240 @@ msgstr "_Herramientas"
 msgid "5 Days"
 msgstr "5 Días"
 
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+#: ui/evolution-calendar.xml.h:2
 msgid "Alter preferences"
 msgstr "Alterar preferencias"
 
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:7
 msgid "Create a new all day Event"
 msgstr "Crear un nuevo evento de todo el día"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:8
 msgid "Create a new appointment"
 msgstr "Crear una nueva cita"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:9
 msgid "Create a new calendar"
 msgstr "Creando un nuevo calendario"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Día"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:13
 msgid "Go To"
 msgstr "Ir a"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back in time"
 msgstr "Volver en el tiempo"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward in time"
 msgstr "Avanzar en el tiempo"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Ir a una _fecha"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Ir a una fecha específica"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to present time"
 msgstr "Ir al momento actual"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:22
 msgid "New _Event"
 msgstr "Nuevo _Evento"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
+msgid "Next"
+msgstr "Siguiente"
+
+#: ui/evolution-calendar.xml.h:25
 msgid "Open Calendar"
 msgstr "Abrir calendario"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:28
 msgid "Prev"
 msgstr "Previo"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:29
 msgid "Previews the calendar to be printed"
 msgstr "Vista previa del calendario a imprimir"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:32
 msgid "Print calendar"
 msgstr "Imprimir calendario"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:33
 msgid "Print this Calendar"
 msgstr "Imprimir este calendario"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:19
+#: ui/evolution-calendar.xml.h:34
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Información Requerida"
+
+#: ui/evolution-calendar.xml.h:35
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "Guardar como"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:37
 msgid "Save calendar as something else"
 msgstr "Guardar el calendario como otra cosa"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:38
+msgid "Settings..."
+msgstr "Configuración..."
+
+#: ui/evolution-calendar.xml.h:39
 msgid "Show 1 day"
 msgstr "Mostrar 1 día"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:40
 msgid "Show 1 month"
 msgstr "Mostrar un mes"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:41
 msgid "Show 1 week"
 msgstr "Mostrar 1 semana"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:42
 msgid "Show the working week"
 msgstr "Mostrar un semana laboral"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
+#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
+#: widgets/misc/e-dateedit.c:431
 msgid "Today"
 msgstr "Hoy"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:44
 msgid "W_ork Week"
 msgstr "Semana lab_oral"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:45
 msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:46
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:48
 msgid "_Day"
 msgstr "_Día"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:49
 msgid "_Month"
 msgstr "_Mes"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution.xml.h:58
+#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:51
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:56
 msgid "_Week"
 msgstr "_Semana"
 
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Cerrar"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Cerrar esta cita"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Borrar esta cita"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Barra de herramientas principal"
+
+#: ui/evolution-comp-editor.xml.h:7
+msgid "Preview the printed item"
+msgstr "Ver el elemento que va a ser impreso"
+
+#: ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Vista pre_via"
+
+#: ui/evolution-comp-editor.xml.h:11
+msgid "Print S_etup"
+msgstr "Configurar Impr_esión"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Print this item"
+msgstr "Imprimir este elemento"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Print..."
+msgstr "Imprimir..."
+
+#: ui/evolution-comp-editor.xml.h:14 widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Guardar como..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Save and Close"
+msgstr "Guardar y cerrar"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Guardar la cita y cerrar la ventana de diálogo"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Cambiar la vista a %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar los datos de la página para la impresora actual"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Acciones"
+
+#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Archivo"
+
+#: ui/evolution-comp-editor.xml.h:22 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "A_yuda"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Borrar este elemento"
@@ -7957,27 +9501,12 @@ msgstr "Ayuda"
 msgid "Print En_velope..."
 msgstr "Imprimir ca_becera..."
 
-#: ui/evolution-contact-editor.xml.h:6
-#: ui/evolution-contact-list-editor.xml.h:5
-msgid "Print this item"
-msgstr "Imprimir este elemento"
-
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:6
-msgid "Print..."
-msgstr "Imprimir..."
-
 #: ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:7
 #: ui/evolution-message-composer.xml.h:20
 msgid "Save _As..."
 msgstr "Guardar _como..."
 
-#: ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:8
-msgid "Save and Close"
-msgstr "Guardar y cerrar"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Guardar el contacto y cerrar la ventana de diálogo"
@@ -7995,16 +9524,9 @@ msgstr "Ver la ayuda en línea"
 msgid "Send _message to contact..."
 msgstr "Enviar un _mensaje al contacto..."
 
-#: ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
-msgid "_File"
-msgstr "_Archivo"
-
 #: ui/evolution-contact-editor.xml.h:16
 #: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -8057,8 +9579,8 @@ msgstr "Concertar un _encuentro"
 msgid "Schedule a meeting for this item"
 msgstr "Concertar un encuentro para este elemento"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Actions"
 msgstr "_Acciones"
 
@@ -8066,485 +9588,538 @@ msgstr "_Acciones"
 msgid "Customise My Evolution"
 msgstr "Personalizar Mi Evolution"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Apply filter rules to the selected messages"
-msgstr "Aplicar filtros a los mensajes seleccionados"
-
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancelar la operación de correo actual"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Nuevo"
+
+#: ui/evolution-mail-global.xml.h:4
+msgid "Create or edit mail accounts and other preferences"
+msgstr "Crear o editar cuentas de correo y otras preferencias"
+
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit rules for filtering new mail"
+msgstr "Crear o editar reglas para el filtrado de mensajes"
+
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit virtual folder definitions"
+msgstr "Crear o editar definiciones de carpetas virtuales"
+
+#: ui/evolution-mail-global.xml.h:7
+msgid "Empty _Trash"
+msgstr "Vaciar _Papelera"
+
+#: ui/evolution-mail-global.xml.h:8
+msgid "Forget _Passwords"
+msgstr "Olvidar _contraseña"
+
+#: ui/evolution-mail-global.xml.h:9
+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-global.xml.h:10
+msgid "Manage _Subscriptions..."
+msgstr "Administrar _suscripciones..."
+
+#: ui/evolution-mail-global.xml.h:11
+msgid "Open a window for composing a mail message"
+msgstr "Abrir una ventana para escribir un mensaje de correo"
+
+#: ui/evolution-mail-global.xml.h:12
+msgid "Permanently remove all deleted messages from all folders"
+msgstr ""
+"Eliminar permanentemente todos los mansajes borrados de todas las carpetas"
+
+#: ui/evolution-mail-global.xml.h:13
+msgid "Send / Receive"
+msgstr "Enviar / Recibir"
+
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send queued mail and retrieve new mail"
+msgstr "Enviar el correo en la cola y obtener el nuevo"
+
+#: ui/evolution-mail-global.xml.h:15
+msgid "Show message preview window"
+msgstr "Mostrar ventana de vista previa del mensajes"
+
+#: ui/evolution-mail-global.xml.h:16
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Suscribirse o desuscribirse de carpetas de los servidores remotos"
+
+#: ui/evolution-mail-global.xml.h:17
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor de carpetas virtuales..."
+
+#: ui/evolution-mail-global.xml.h:18
+msgid "_Filters..."
+msgstr "_Filtros..."
+
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Mail Message"
+msgstr "_Mensaje de correo"
+
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Settings..."
+msgstr "_Configuración del correo..."
+
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Preview Pane"
+msgstr "Vista _previa"
+
+#: ui/evolution-mail-global.xml.h:22
+msgid "_Send / Receive"
+msgstr "_Enviar / Recibir"
+
+#: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose"
-msgstr "Nuevo"
+#: ui/evolution-mail-list.xml.h:3
+msgid "Copy selected messages"
+msgstr "Copiar los mensajes _seleccionados"
+
+#: ui/evolution-mail-list.xml.h:5
+msgid "Cut selected messages"
+msgstr "Cortar lod mensajes seleccionados"
+
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Ocultar los mensajes _seleccionados"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Ocultar mensajes _borrados"
+
+#: ui/evolution-mail-list.xml.h:8
+msgid "Hide _Read messages"
+msgstr "Ocultar mensajes _leídos"
+
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Marcar todos como l_eídos"
+
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr "Marcar los mensajes visibles como leídos"
+
+#: ui/evolution-mail-list.xml.h:13
+msgid "Paste message in the clipboard"
+msgstr "Pegar el mensaje en el portapapeles"
+
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Eliminar permanentemente todos los mansajes borrados de esta carpeta"
+
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Seleccionar _todo"
+
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Seleccionar _Hilo"
+
+#: ui/evolution-mail-list.xml.h:17
+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-list.xml.h:18
+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-list.xml.h:19
+msgid "Select all visible messages"
+msgstr "Seleccionar todos los mensajes visibles"
+
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Mostrar _todo"
+
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr "Mostrar mensajes que han estado ocultos temporalmente"
+
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Oculta temporalmente todos los mensajes que han sido leiods"
+
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
+msgstr "Oculta temporalmente los mensajes seleccionados"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Lista de Mensajes Encadenados"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Comprimir"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Carpeta"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Invertir selección"
+
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Propiedades..."
+
+#: ui/evolution-mail-list.xml.h:29
+msgid "_Threaded Message List"
+msgstr "_Lista de Mensajes Encadenados"
+
+#: ui/evolution-mail-message.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "Aplicar filtros a los mensajes seleccionados"
+
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Responder a todos los destinatarios del mensaje seleccionado"
 
-#: ui/evolution-mail.xml.h:7
+#: ui/evolution-mail-message.xml.h:3
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responder a la lista de correo remitente del mensaje seleccionado"
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responder al remitente del mensaje seleccionado"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Copy selected messages"
-msgstr "Copiar los mensajes _seleccionados"
-
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Copiar mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Crear una Carpeta _Virtual según el mensaje"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear una regla para filtrar los mensajes de este remitente"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crear una regla para filtrar los mensajes de estos destinatarios"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crear una regla para filtrar los mensajes de esta lista de correo"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crear una regla para filtrar los mensajes con este asunto"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
 msgstr "Crear una carpeta virtual para estos destinatarios"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
 msgstr "Crear una carpeta virtual para esta lista de correo"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
 msgstr "Crear una carpeta virtual para este remitente"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
 msgstr "Crear una carpeta virtual para este asunto"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Crear o editar cuentas de correo y otras preferencias"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Create or edit rules for filtering new mail"
-msgstr "Crear o editar reglas para el filtrado de mensajes"
-
-#: ui/evolution-mail.xml.h:23
-msgid "Create or edit virtual folder definitions"
-msgstr "Crear o editar definiciones de carpetas virtuales"
-
-#: ui/evolution-mail.xml.h:25
-msgid "Cut selected messages"
-msgstr "Cortar lod mensajes seleccionados"
-
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:17
 msgid "Display the next important message"
 msgstr "Mostrar el siguiente mensaje importante"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next message"
 msgstr "Mostrar el mensaje siguiente"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next unread message"
 msgstr "Mostrar el siguiente mensaje no leido"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
 msgstr "Mostrar el siguiente hilo no leido"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the previous important message"
 msgstr "Mostrar el anterior mensaje importante"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous message"
 msgstr "Mostrar el mensaje anterior"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no leído"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Empty _Trash"
-msgstr "Vaciar _Papelera"
-
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:24
 msgid "Filter on Mailing _List"
 msgstr "Filtrar según la _lista de correo"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Se_nder"
 msgstr "Filtrar según el remite_nte"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on _Recipients"
 msgstr "Filtrar según los destinata_rios"
 
-#: ui/evolution-mail.xml.h:38
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Subject"
 msgstr "Filtrar según el a_sunto"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:28
 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:40
-msgid "Forget _Passwords"
-msgstr "Olvidar _contraseña"
-
-#: ui/evolution-mail.xml.h:41
-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-message.xml.h:29
+msgid "Forward"
+msgstr "Reenviar"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Reenviar como"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
 msgstr "Reenviar _Adjunto"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
 msgstr "Reenviar _dentro del mensaje"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
 msgstr "Reenviar _Citado"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:34
 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:48
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenviar el mensaje seleccionado citado como una respuesta"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message to someone"
 msgstr "Reenviar el mensaje seleccionado a alguien"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail-message.xml.h:37
 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:51
-msgid "Hide S_elected Messages"
-msgstr "Ocultar los mensajes _seleccionados"
-
-#: ui/evolution-mail.xml.h:52
-msgid "Hide _Deleted Messages"
-msgstr "Ocultar mensajes _borrados"
-
-#: ui/evolution-mail.xml.h:53
-msgid "Hide _Read messages"
-msgstr "Ocultar mensajes _leídos"
-
-#: ui/evolution-mail.xml.h:54
-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:55
+#: ui/evolution-mail-message.xml.h:38
 msgid "Load _Images"
 msgstr "Cargar _Imágenes"
 
-#: ui/evolution-mail.xml.h:56
-msgid "Manage _Subscriptions..."
-msgstr "Administrar _suscripciones..."
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail-message.xml.h:39
 msgid "Mar_k As Read"
 msgstr "Mar_car como Leído"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Mark All as R_ead"
-msgstr "Marcar todos como l_eídos"
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Mark As I_mportant"
+msgstr "Marcar como _no leído"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark As U_nread"
 msgstr "Marcar como _no leído"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Mark all visible messages as read"
-msgstr "Marcar los mensajes visibles como leídos"
-
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail-message.xml.h:42
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leidos"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Marcar los mensajes seleccionados para borrar"
+
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leidos"
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para borrar"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:46
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail-message.xml.h:47
 msgid "Move selected messages to another folder"
 msgstr "Mover mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Open a window for composing a mail message"
-msgstr "Abrir una ventana para escribir un mensaje de correo"
-
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail-message.xml.h:49
 msgid "Open the selected message in a new window"
 msgstr "Abrir el mensaje seleccionado en una nueva ventana"
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail-message.xml.h:50
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abrir el mensaje seleccionado para reenviarlo"
 
-#: ui/evolution-mail.xml.h:71
-msgid "Paste message in the clipboard"
-msgstr "Pegar el mensaje en el portapapeles"
-
-#: ui/evolution-mail.xml.h:72
-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:73
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Eliminar permanentemente todos los mansajes borrados de esta carpeta"
-
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail-message.xml.h:51
 msgid "Previews the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:52
+msgid "Previous"
+msgstr "Previo"
+
+#: ui/evolution-mail-message.xml.h:54
 msgid "Print Message..."
 msgstr "Imprimir Mensaje..."
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail-message.xml.h:55
 msgid "Print Preview..."
 msgstr "Vista previa..."
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail-message.xml.h:56
 msgid "Print message to the printer"
 msgstr "Imprimir el mensaje en la impresora"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:57
 msgid "Redirect (FIXME: implement me)"
 msgstr "Redirigir (ARREGLAME: implementame)"
 
-#: ui/evolution-mail.xml.h:85
+#: ui/evolution-mail-message.xml.h:58
+msgid "Reply"
+msgstr "Responder"
+
+#: ui/evolution-mail-message.xml.h:59
+msgid "Reply to All"
+msgstr "Re: Todos"
+
+#: ui/evolution-mail-message.xml.h:62
 msgid "S_earch Message"
 msgstr "Buscar M_ensaje"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:63
 msgid "Save the message as a text file"
 msgstr "Guardar el mensaje en un archivo de texto"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:64
 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:88 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Seleccionar _todo"
-
-#: ui/evolution-mail.xml.h:89
-msgid "Select _Thread"
-msgstr "Seleccionar _Hilo"
-
-#: ui/evolution-mail.xml.h:90
-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:91
-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:92
-msgid "Select all visible messages"
-msgstr "Seleccionar todos los mensajes visibles"
-
-#: ui/evolution-mail.xml.h:93
-msgid "Send / Receive"
-msgstr "Enviar / Recibir"
-
-#: ui/evolution-mail.xml.h:94
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar el correo en la cola y obtener el nuevo"
-
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail-message.xml.h:65
 msgid "Show Email _Source"
 msgstr "Mostrar la Fuente del Men_saje"
 
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail-message.xml.h:66
 msgid "Show Full _Headers"
 msgstr "Mostrar cabeceras completas"
 
-#: ui/evolution-mail.xml.h:97
-msgid "Show _All"
-msgstr "Mostrar _todo"
-
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:67
 msgid "Show message in the normal style"
 msgstr "Mostrar mensajes en el estilo normal"
 
-#: ui/evolution-mail.xml.h:99
-msgid "Show message preview window"
-msgstr "Mostrar ventana de vista previa del mensajes"
-
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:68
 msgid "Show message with all email headers"
 msgstr "Mostrar mensajes con todas las cabeceras"
 
-#: ui/evolution-mail.xml.h:101
-msgid "Show messages that have been temporarily hidden"
-msgstr "Mostrar mensajes que han estado ocultos temporalmente"
-
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail-message.xml.h:69
 msgid "Show the raw email source of the message"
 msgstr "Mostrar la fuentes sin formatear del mensaje"
 
-#: ui/evolution-mail.xml.h:103
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Suscribirse o desuscribirse de carpetas de los servidores remotos"
-
-#: ui/evolution-mail.xml.h:104
-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:105
-msgid "Temporarily hide the selected messages"
-msgstr "Oculta temporalmente los mensajes seleccionados"
-
-#: ui/evolution-mail.xml.h:106
-msgid "Threaded Message list"
-msgstr "Lista de Mensajes Encadenados"
-
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:70
 msgid "Un-delete the selected messages"
 msgstr "Recuperar los mensajes seleccionados"
 
-#: ui/evolution-mail.xml.h:108
+#: ui/evolution-mail-message.xml.h:71
 msgid "VFolder on Mailing _List..."
 msgstr "Carpeta virtual según la _Lista de Correo..."
 
-#: ui/evolution-mail.xml.h:109
+#: ui/evolution-mail-message.xml.h:72
 msgid "VFolder on Se_nder..."
 msgstr "VFolder según el Remite_nte..."
 
-#: ui/evolution-mail.xml.h:110
+#: ui/evolution-mail-message.xml.h:73
 msgid "VFolder on _Recipients..."
 msgstr "VFolder según los Destinata_rios..."
 
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail-message.xml.h:74
 msgid "VFolder on _Subject..."
 msgstr "VFolder según el A_sunto..."
 
-#: ui/evolution-mail.xml.h:112
-msgid "Virtual Folder _Editor..."
-msgstr "_Editor de carpetas virtuales..."
-
-#: ui/evolution-mail.xml.h:113
+#: ui/evolution-mail-message.xml.h:75
 msgid "_Apply Filters"
 msgstr "_Aplicar filtro"
 
-#: ui/evolution-mail.xml.h:114
+#: ui/evolution-mail-message.xml.h:76
 msgid "_Copy to Folder"
 msgstr "_Copiar a la Carpeta"
 
-#: ui/evolution-mail.xml.h:115
+#: ui/evolution-mail-message.xml.h:77
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail.xml.h:117
-msgid "_Expunge"
-msgstr "_Comprimir"
-
-#: ui/evolution-mail.xml.h:118
-msgid "_Filters..."
-msgstr "_Filtros..."
-
-#: ui/evolution-mail.xml.h:119 ui/evolution.xml.h:50
-msgid "_Folder"
-msgstr "_Carpeta"
-
-#: ui/evolution-mail.xml.h:120
+#: ui/evolution-mail-message.xml.h:79
 msgid "_Forward Message"
 msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail.xml.h:121 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Invertir selección"
-
-#: ui/evolution-mail.xml.h:122
-msgid "_Mail Message"
-msgstr "_Mensaje de correo"
-
-#: ui/evolution-mail.xml.h:123
-msgid "_Mail Settings..."
-msgstr "_Configuración del correo..."
-
-#: ui/evolution-mail.xml.h:124
+#: ui/evolution-mail-message.xml.h:80
 msgid "_Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: ui/evolution-mail.xml.h:125
+#: ui/evolution-mail-message.xml.h:81
 msgid "_Move to Folder"
 msgstr "_Mover a la Carpeta"
 
-#: ui/evolution-mail.xml.h:126
+#: ui/evolution-mail-message.xml.h:82
 msgid "_Normal Display"
 msgstr "Vista _Normal"
 
-#: ui/evolution-mail.xml.h:127
+#: ui/evolution-mail-message.xml.h:83
 msgid "_Open Message"
 msgstr "_Abrir Mensaje"
 
-#: ui/evolution-mail.xml.h:128
-msgid "_Preview Pane"
-msgstr "Vista _previa"
-
-#: ui/evolution-mail.xml.h:129 ui/evolution.xml.h:60
-msgid "_Properties..."
-msgstr "_Propiedades..."
-
-#: ui/evolution-mail.xml.h:130
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Re-send Message"
 msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail.xml.h:133
-msgid "_Send / Receive"
-msgstr "_Enviar / Recibir"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
 
-#: ui/evolution-mail.xml.h:134
-msgid "_Threaded Message List"
-msgstr "_Lista de Mensajes Encadenados"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Personali_zar barras de herramientas..."
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personalizar"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Personalizar barras de herramientas"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Cerrar"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Vista"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -8606,7 +10181,7 @@ msgstr "Encriptar con S/MIME"
 msgid "S/MIME Sign"
 msgstr "Firmar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:241
+#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:240
 msgid "Save"
 msgstr "Guardar"
 
@@ -8702,10 +10277,6 @@ msgstr "Campo Cc_o"
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:44 ui/evolution.xml.h:44
-msgid "_Close"
-msgstr "_Cerrar"
-
 #: ui/evolution-message-composer.xml.h:45
 msgid "_Debug"
 msgstr "_Depurar"
@@ -8718,59 +10289,52 @@ msgstr "_Borrar todo"
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ui/evolution-message-composer.xml.h:50 ui/evolution.xml.h:53
-msgid "_Help"
-msgstr "A_yuda"
-
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:50
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ui/evolution-message-composer.xml.h:52
-msgid "_Insert text file... (FIXME)"
-msgstr "_Insert text file... (FIXME)"
+#: ui/evolution-message-composer.xml.h:51
+#, fuzzy
+msgid "_Insert text file..."
+msgstr "Insertar un archivo de texto..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:56
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Seguridad"
 
-#: ui/evolution-message-composer.xml.h:57 ui/evolution.xml.h:65
-msgid "_View"
-msgstr "_Vista"
-
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Añadir carpeta a tu lista de carpeta suscritas"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Carpetas"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Regenerar la lista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Regenerar la lista de carpetas"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Quitar carpetas de tu lista de carpetas suscritas"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Suscribir"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Dessuscribir"
 
@@ -8787,22 +10351,47 @@ msgid "Re_fresh Task"
 msgstr "Re_leer Tarea"
 
 #: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Copiar los mensajes _seleccionados"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Create a new task"
 msgstr "Crear una nueva tarea"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:4
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Borrar las tareas seleccionadas"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "New Task"
 msgstr "Nueva tarea"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Pegar el contenido del porta papeles"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Save task as something else"
 msgstr "Guardar la tarea como otra cosa"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Set task view preferences"
+msgstr "Alterar preferencias"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Tasks Preferences..."
 msgstr "Preferencias de las tareas..."
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "TasksPreferences"
+msgstr "Preferencias de las tareas..."
+
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Tarea"
 
@@ -8818,210 +10407,193 @@ msgstr "Añadir a la barra de atajo_s"
 msgid "Change the name of this folder"
 msgstr "Cambiar el nombre de esta carpeta"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "Cambiar las propiedades de esta carpeta"
-
 #: ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Copiar esta carpeta"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "Crear una _Nueva Carpeta..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Crear un enlace a esta carpeta en la lista de atajos"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Crear una nueva carpeta"
 
-#: ui/evolution.xml.h:11
-msgid "Customi_ze Toolbars..."
-msgstr "Personali_zar barras de herramientas..."
-
-#: ui/evolution.xml.h:12
-msgid "Customize"
-msgstr "Personalizar"
-
 #: ui/evolution.xml.h:13
-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
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Mostrar una carpeta distinta"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "_FAQ de Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "_Ventana de Evolution"
 
-#: ui/evolution.xml.h:19
-msgid "Evolution bar _shortcut"
-msgstr "Barra de _atajos de Evolution"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Salir del programa"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Comenzando"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importar un formato de archivo externo"
 
-#: ui/evolution.xml.h:23
-msgid "Main toolbar"
-msgstr "Barra de herramientas principal"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "Mueve esta carpeta a otro sitio"
 
-#: ui/evolution.xml.h:25
-msgid "Open in New Window"
-msgstr "Abrir en una nueva ventana"
-
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Abrir en una Nueva _Ventana"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Abre esta carpeta en una nueva ventana"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Mostrar información acerca de Evolution"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Enviar reporte de fallo"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar un reporte de fallo usando Bug Buddy."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "Activar"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Activar si se estamos trabajando desconectados o no."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Usando el administrador de c_ontactos"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Usando el _calendario"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Usando el _correo"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Appointment (FIXME)"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_Contact (FIXME)"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Barra de _carpetas"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importar archivo..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Índice"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Enviar mensaje"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Nueva carpeta"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "Barra de atajo_s"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_Task (FIXME)"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
+#: ui/my-evolution.xml.h:1
+#, fuzzy
+msgid "Change the settings for My Evolution"
+msgstr "Cambiar las propiedades de esta carpeta"
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_Configuración del correo..."
+
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Tarjetas de Visita"
@@ -9034,6 +10606,26 @@ msgstr "Por Compañía"
 msgid "Phone List"
 msgstr "Lista de teléfonos"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Vista de la tarjeta"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Mes"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Definir Vistas"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Semana lab_oral"
+
 #: views/mail/galview.xml.h:1
 msgid "By Sender"
 msgstr "Por remitente"
@@ -9147,52 +10739,124 @@ msgstr "Definir Vistas"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
+#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
 msgid "Now"
 msgstr "Ahora"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La fecha debe estar en el formato: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+#, fuzzy
+msgid "Baltic"
+msgstr "Bases"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "Semana"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Papelera"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Fallo en la transacción"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "_Nuevo"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Juego de caracteres por defecto: "
+
+#: widgets/misc/e-charset-picker.c:202
+#, fuzzy
+msgid "Enter the character set to use"
+msgstr "Juego de caracteres por defecto: "
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Otro"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:167
 msgid "Save Search"
 msgstr "Guardar búsqueda"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:238
 msgid "Advanced Search"
 msgstr "Búqueda avanzada"
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Guardar como..."
-
 #: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: widgets/misc/e-filter-bar.h:96 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Editar..."
-
 #: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avanzado..."
@@ -9246,6 +10910,129 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#~ msgid "Change the properties for this folder"
+#~ msgstr "Cambiar las propiedades de esta carpeta"
+
+#, fuzzy
+#~ msgid "Error opening file: %s"
+#~ msgstr "Error cargando el archivo: %s"
+
+#~ msgid "="
+#~ msgstr "="
+
+#~ msgid "Find..."
+#~ msgstr "Buscar..."
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Las alarmas cesan tras"
+
+#~ msgid "Audio Alarms"
+#~ msgstr "Alarmas auditivas"
+
+#~ msgid "Colors"
+#~ msgstr "Colores"
+
+#~ msgid "Display options"
+#~ msgstr "Mostrar opciónes"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Habilitar recordatorio para"
+
+#~ msgid "Highlight"
+#~ msgstr "Resaltar"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Elementos con plazo para hoy:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Elementos dentro de plazo"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Elementos dentro del plazo:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Elementos fuera de plazo:"
+
+#~ msgid "TaskPad"
+#~ msgstr "Tabla de tares"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tiempo hasta el plazo"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmas visuales"
+
+#~ msgid "Work week"
+#~ msgstr "Semana laboral"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No pude abrir el archivo de firma %s:\n"
+#~ "%s"
+
+#~ msgid "That file does not exist."
+#~ msgstr "Ese archivo no existe."
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Ese no es un archivo normal."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Ese archivo no es legible."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Ese archivo parece accesible pero open(2) ha fallado."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "El archivo es muy largo (más de 100K).\n"
+#~ "¿Esta seguro que quiere añadirlo?"
+
+#~ msgid "An error occurred while reading the file."
+#~ msgstr "Ha ocurrido un error mientras se leía el archivo."
+
+#~ msgid "Moving folder %s to %s"
+#~ msgstr "Moviendo la carpeta %s a %s"
+
+#~ msgid "Copying folder %s to %s"
+#~ msgstr "Copiando carpeta %s a %s"
+
+#~ msgid "Activate"
+#~ msgstr "Activar"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activar este atajo"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Insert text file... (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Barra de _atajos de Evolution"
+
+#~ msgid "Reply to the sender of this message"
+#~ msgstr "Responder al remitente de este mensaje"
+
+#~ msgid "Reply to all recipients of this message"
+#~ msgstr "Responder a todos los destinatarios de este mensaje"
+
+#~ msgid "Forward this message"
+#~ msgstr "Reenviar este mensaje"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Imprimir el mensaje seleccionado"
+
+#~ msgid "Delete this message"
+#~ msgstr "Borrar este mensaje"
+
+#~ msgid "Previous message"
+#~ msgstr "Mensaje previo"
+
+#~ msgid "Next message"
+#~ msgstr "Mensaje siguiente"
+
 #~ msgid "Select everything"
 #~ msgstr "Seleccionar todo"
 
@@ -9297,21 +11084,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Update Calendar"
 #~ msgstr "Actualizar calendario"
 
-#~ msgid "Cancel Meeting"
-#~ msgstr "Cancelar encuentro"
-
-#~ msgid "Preview the printed item"
-#~ msgstr "Ver el elemento que va a ser impreso"
-
-#~ msgid "Print Pre_view"
-#~ msgstr "Vista pre_via"
-
-#~ msgid "Print S_etup"
-#~ msgstr "Configurar Impr_esión"
-
-#~ msgid "Setup the page settings for your current printer"
-#~ msgstr "Configurar los datos de la página para la impresora actual"
-
 #~ msgid "Schedule Meeting"
 #~ msgstr "Concertar encuentro"
 
@@ -9334,9 +11106,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Chair"
 #~ msgstr "Silla"
 
-#~ msgid "Meeting Invitations"
-#~ msgstr "Invitaciones para la reunión"
-
 #~ msgid "Non-Participant"
 #~ msgstr "No participa"
 
@@ -9400,9 +11169,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "Chec_k Names (FIXME)"
 
-#~ msgid "Clear"
-#~ msgstr "Limpiar"
-
 #~ msgid "Clear the selection"
 #~ msgstr "Quitar la seleccionada"
 
@@ -9421,9 +11187,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Find"
 #~ msgstr "Buscar"
 
-#~ msgid "Find Again"
-#~ msgstr "Buscar de nuevo"
-
 #~ msgid "For_ward (FIXME)"
 #~ msgstr "For_ward (FIXME)"
 
@@ -9517,15 +11280,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "_Unread Item (FIXME)"
 #~ msgstr "_Unread Item (FIXME)"
 
-#~ msgid "Close this appointment"
-#~ msgstr "Cerrar esta cita"
-
-#~ msgid "Delete this appointment"
-#~ msgstr "Borrar esta cita"
-
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Guardar la cita y cerrar la ventana de diálogo"
-
 #~ msgid "Schedule some sort of a meeting"
 #~ msgstr "Programas algún tipo de encuentro"
 
@@ -9535,31 +11289,9 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "%A, %e %B %Y"
 #~ msgstr "%A, %e %B %Y"
 
-#~ msgid "Appointments"
-#~ msgstr "Citas"
-
-#~ msgid "%I:%M%p"
-#~ msgstr "%I:%M%p"
-
-#~ msgid "<b>Error loading calendar</b>"
-#~ 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"
 
-#~ msgid "Show appointments"
-#~ msgstr "Mostrar citas"
-
-#~ msgid "Show tasks"
-#~ msgstr "Mostrar tareas"
-
-#~ msgid "Things to do"
-#~ msgstr "Cosas por hacer"
-
-#~ msgid "Cannot initialize Evolution's Executive Summary component."
-#~ msgstr ""
-#~ "No puedo inicializar el componente de resumen de trabajo de Evolution."
-
 #~ msgid ""
 #~ "Cannot open the HTML file:\n"
 #~ "%s"
@@ -9599,9 +11331,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Send an email to %s"
 #~ msgstr "Enviar un correo a %s"
 
-#~ msgid "Change the view to %s"
-#~ msgstr "Cambiar la vista a %s"
-
 #~ msgid "Run %s"
 #~ msgstr "Ejecutar %s"
 
@@ -9642,12 +11371,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ "significa\n"
 #~ "que compiló Bonobo con GOAD en lugar de con OAF."
 
-#~ msgid "Evolution component for the executive summary."
-#~ msgstr "Componente Evolution para el resumen de trabajo."
-
-#~ msgid "Factory for the Evolution executive summary component."
-#~ msgstr "Factoría para el componente resumen de trabajo de Evolution."
-
 #~ msgid "Factory for the RDF summary."
 #~ msgstr "Factoría para el resumen RDF."
 
@@ -9669,18 +11392,12 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Update automatically"
 #~ msgstr "Actualizado automático"
 
-#~ msgid "Update now"
-#~ msgstr "Actualizar ahora"
-
 #~ msgid "Update every "
 #~ msgstr "Actualizar cada "
 
 #~ msgid "Incomplete message written on pipe!"
 #~ msgstr "¡Mensaje escrito incompleto en la tubería!"
 
-#~ msgid "Mail Summary"
-#~ msgstr "Resumen de Correo"
-
 #~ msgid "Inline attachment"
 #~ msgstr "Adjunto en línea"
 
@@ -9854,9 +11571,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "SASL"
 #~ msgstr "SASL"
 
-#~ msgid "Show all "
-#~ msgstr "Mostrar todo "
-
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Aplicar cualquier filtro nuevo al correo en este buzón"