Updated Spanish translation.

svn path=/trunk/; revision=10995

1 files changed, 1958 insertions, 2269 deletions

diff --git a/po/es.po b/po/es.po
index 15e7dc5711..133a5bc7fd 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-07-06 13:14+0200\n"
+"POT-Creation-Date: 2001-07-10 20:31+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,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3546
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Factoría para importar archivos VCard a Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Importa archivos VCard a Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3606
 msgid "Card: "
 msgstr "Tarjeta: "
 
-#: addressbook/backend/ebook/e-card.c:3548
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +34,7 @@ msgstr ""
 "\n"
 "Nombre:"
 
-#: addressbook/backend/ebook/e-card.c:3549
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +42,7 @@ msgstr ""
 "\n"
 "  Prefijo:    "
 
-#: addressbook/backend/ebook/e-card.c:3550
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +50,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3551
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +58,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3552
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +66,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3553
+#: addressbook/backend/ebook/e-card.c:3613
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +74,7 @@ msgstr ""
 "\n"
 "  Sufijo:     "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +82,7 @@ msgstr ""
 "\n"
 "Fecha de nacimiento: "
 
-#: addressbook/backend/ebook/e-card.c:3578
+#: addressbook/backend/ebook/e-card.c:3638
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +90,7 @@ msgstr ""
 "\n"
 "Dirección:"
 
-#: addressbook/backend/ebook/e-card.c:3580
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +98,7 @@ msgstr ""
 "\n"
 "  Dirección postal: "
 
-#: addressbook/backend/ebook/e-card.c:3581
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +106,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3582
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +114,7 @@ msgstr ""
 "\n"
 "  Calle:       "
 
-#: addressbook/backend/ebook/e-card.c:3583
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +122,7 @@ msgstr ""
 "\n"
 "  Ciudad:      "
 
-#: addressbook/backend/ebook/e-card.c:3584
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +130,7 @@ msgstr ""
 "\n"
 "  Región:      "
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +138,7 @@ msgstr ""
 "\n"
 "  Código postal: "
 
-#: addressbook/backend/ebook/e-card.c:3586
+#: addressbook/backend/ebook/e-card.c:3646
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +146,7 @@ msgstr ""
 "\n"
 "  País:        "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3659
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +154,7 @@ msgstr ""
 "\n"
 "Etiqueta de envío: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3671
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +162,7 @@ msgstr ""
 "\n"
 "Teléfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3614
+#: addressbook/backend/ebook/e-card.c:3674
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +170,7 @@ msgstr ""
 "\n"
 "Teléfono:"
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3698
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +178,7 @@ msgstr ""
 "\n"
 "Correo electrónico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3701
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +186,7 @@ msgstr ""
 "\n"
 "Correo electrónico:"
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3720
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +194,7 @@ msgstr ""
 "\n"
 "Programa de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3666
+#: addressbook/backend/ebook/e-card.c:3726
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +202,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3734
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +210,7 @@ msgstr ""
 "\n"
 "Localización geográfica: "
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3738
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +218,7 @@ msgstr ""
 "\n"
 "Cargo: "
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +226,7 @@ msgstr ""
 "\n"
 "Organización: "
 
-#: addressbook/backend/ebook/e-card.c:3691
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +234,7 @@ msgstr ""
 "\n"
 "  Nombre: "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +242,7 @@ msgstr ""
 "\n"
 "  Unidad: "
 
-#: addressbook/backend/ebook/e-card.c:3693
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidad2: "
 
-#: addressbook/backend/ebook/e-card.c:3694
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidad3: "
 
-#: addressbook/backend/ebook/e-card.c:3695
+#: addressbook/backend/ebook/e-card.c:3755
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +266,7 @@ msgstr ""
 "\n"
 "  Unidad4: "
 
-#: addressbook/backend/ebook/e-card.c:3699
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +274,7 @@ msgstr ""
 "\n"
 "categorías: "
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3760
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3773
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +300,7 @@ msgstr ""
 "\n"
 "Cadena única: "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3776
 msgid ""
 "\n"
 "Public Key: "
@@ -300,27 +308,15 @@ msgstr ""
 "\n"
 "Llave pública: "
 
-#: addressbook/backend/ebook/e-card.c:3978
+#: addressbook/backend/ebook/e-card.c:4038
 msgid "Multiple VCards"
 msgstr "VCards Múltiples"
 
-#: addressbook/backend/ebook/e-card.c:3986
+#: addressbook/backend/ebook/e-card.c:4046
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
 
-#: addressbook/backend/ebook/e-destination.c:344
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Factoría para importar archivos VCard a Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importa archivos VCard a Evolution."
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
@@ -358,6 +354,191 @@ msgstr "No se puede inicializar wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "No pude leer información de la aplicación de direcciones del pilot"
 
+#: 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."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Un control Bonobo para mostrar una dirección."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Un control Bonobo de ejemplo que muestra una agenda."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Control que muestra minitarjetas de direcciones en Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Visor de Minitarjetas de Direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Componente de Evolution para manejar contactos."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Factoría para el controlde Minitarjetas de Direcciones"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Factoría para el visualizador de direcciones de la Agenda"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Factoría para la ventana de direcciones de la Agenda"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Factoría para el componente de agenda de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Factoría para el control de ejemplo de la Agenda"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Servidor LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Archivo"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tipo de agenda de direcciones desconocido"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+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:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
+msgid "Password"
+msgstr "Clave"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Tipo de autentificación desconocido"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Uno"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Sub-arbol"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Tipo de rango desconocido"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Asociar DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIXME Bind DN Help text here"
+
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:74
+msgid "Remember this password"
+msgstr "Recuerda esta contraseña"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:42
+msgid "Host:"
+msgstr "Servidor:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME Host help text here."
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "DN raíz:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Root DN help text here."
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Puerto:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Port help text here."
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Rango de búsqueda:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autentificación:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Opciones avanzadas de LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:64
+msgid "Path:"
+msgstr "Ruta:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME Path Help text here"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Crear ruta si no existe."
+
+#: addressbook/gui/component/addressbook-config.c:662
+msgid "Edit Addressbook"
+msgstr "Editar agenda de direcciones"
+
+#: addressbook/gui/component/addressbook-config.c:664
+msgid "Add Addressbook"
+msgstr "Añadir agenda de direcciones"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Seleccione el tipo de agenda de direcciones que tiene, e introduzca la "
+"información relevante acerca de ella."
+
+#: addressbook/gui/component/addressbook-config.c:688
+#: mail/mail-config.glade.h:53 my-evolution/e-summary-preferences.c:887
+msgid "Name:"
+msgstr "Nombre:"
+
+#: addressbook/gui/component/addressbook-config.c:689
+msgid "FIXME Name help text here"
+msgstr "FIXME Name help text here"
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descripción:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Description help text here"
+msgstr "FIXME Description help text here"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: calendar/gui/dialogs/alarm-page.glade.h:1
@@ -366,6 +547,211 @@ msgstr "No pude leer información de la aplicación de direcciones del pilot"
 msgid "Add"
 msgstr "Añadir"
 
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Addressbook Sources"
+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: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:8 mail/mail-config.glade.h:27
+#: 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"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
+msgid "Edit"
+msgstr "Editar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+msgid "Name"
+msgstr "Nombre"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-storage.c:99
+msgid "Other Contacts"
+msgstr "Otros contactos"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Introduzca la contraseña para %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "No es posible abrir la agenda de direcciones"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"No podemos abrir este agenda de direcciones.  Esto significa\n"
+"que ha introducido una URI erronea, o que el servidor LDAP está\n"
+"caido"
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Esta versión de Evolution no tiene soporte LDAP compilado.\n"
+"Si quiere usar LDAP en Evolution debe compilar el programa\n"
+"de las fuentes del CVS una vez que haya obtenido LDAP del\n"
+"siguiente enlace.\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"No pudimos abrir esta agenda de direcciones.  Por favor compruebe\n"
+"que existe la ruta y que tiene permisos para acceder a ella."
+
+#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
+msgid "Any field contains"
+msgstr "Cualquier campo contiene"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "El nombre contiene"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "El mensaje contiene"
+
+#: 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"
+
+#.
+#. * 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-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/e-contact-editor.c:1476
+msgid "Primary Email"
+msgstr "Correo electrónico principal"
+
+#: 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/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"
+
+#: 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:274
+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:339
+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/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Interfaz de Evolutión de selección de nombre de la agenda."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+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/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:613
+#: 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:272 shell/e-shortcuts-view.c:475
+msgid "Remove"
+msgstr "Quitar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Quitar Todas"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "¿Enviar correo en HTML?"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Lista de destinatarios"
+
+#: 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 "_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/contact-editor/contact-editor.glade.h:2
 msgid "Anni_versary:"
 msgstr "Ani_versario:"
@@ -418,12 +804,6 @@ 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:1476
-msgid "Primary Email"
-msgstr "Correo electrónico principal"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "Prefiere recibir el correo como _HTML"
@@ -433,7 +813,8 @@ 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:101
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: mail/mail-config.glade.h:102
 msgid "_Add"
 msgstr "_Añadir"
 
@@ -458,7 +839,7 @@ msgid "_Company:"
 msgstr "_Compañía:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1237 mail/mail-config.glade.h:102
+#: mail/folder-browser.c:1293 mail/mail-config.glade.h:103
 #: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
 #: ui/evolution.xml.h:45
 msgid "_Delete"
@@ -508,6 +889,10 @@ 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-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "¿Borrar contacto?"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:663
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto está en estas categorías:"
@@ -600,22 +985,6 @@ msgstr "Telex"
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: 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/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"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "¿Borrar contacto?"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Añadir Contacto"
@@ -745,376 +1114,34 @@ msgstr "_Sufijo:"
 msgid "_Title:"
 msgstr "_Título:"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "Introduzca la contraseña para %s"
-
-#: addressbook/gui/component/addressbook.c:373
-msgid "Unable to open addressbook"
-msgstr "No es posible abrir la agenda de direcciones"
-
-#: addressbook/gui/component/addressbook.c:380
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
-msgstr ""
-"No podemos abrir este agenda de direcciones.  Esto significa\n"
-"que ha introducido una URI erronea, o que el servidor LDAP está\n"
-"caido"
-
-#: addressbook/gui/component/addressbook.c:385
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"Esta versión de Evolution no tiene soporte LDAP compilado.\n"
-"Si quiere usar LDAP en Evolution debe compilar el programa\n"
-"de las fuentes del CVS una vez que haya obtenido LDAP del\n"
-"siguiente enlace.\n"
-
-#: addressbook/gui/component/addressbook.c:393
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-"No pudimos abrir esta agenda de direcciones.  Por favor compruebe\n"
-"que existe la ruta y que tiene permisos para acceder a ella."
-
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
-msgid "Any field contains"
-msgstr "Cualquier campo contiene"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Name contains"
-msgstr "El nombre contiene"
-
-#: addressbook/gui/component/addressbook.c:556
-msgid "Email contains"
-msgstr "El mensaje contiene"
-
-#: 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"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Archivo"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tipo de agenda de direcciones desconocido"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-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:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
-msgid "Password"
-msgstr "Clave"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Tipo de autentificación desconocido"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Uno"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Sub-arbol"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Tipo de rango desconocido"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Asociar DN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Bind DN Help text here"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: 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:42
-msgid "Host:"
-msgstr "Servidor:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME Host help text here."
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "DN raíz:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Root DN help text here."
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Puerto:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME Port help text here."
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Rango de búsqueda:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Autentificación:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Opciones avanzadas de LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:64
-msgid "Path:"
-msgstr "Ruta:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Path Help text here"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "Crear ruta si no existe."
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "Editar agenda de direcciones"
-
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "Añadir agenda de direcciones"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Seleccione el tipo de agenda de direcciones que tiene, e introduzca la "
-"información relevante acerca de ella."
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:53
-msgid "Name:"
-msgstr "Nombre:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "FIXME Name help text here"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "Descripción:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "FIXME Description help text here"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-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: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
-#: 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"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "Editar"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "List _name:"
+msgstr "_Nombre de la lista:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nombre"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+msgid "Members"
+msgstr "Miembros"
 
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Otros contactos"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr "Escriba una dirección de correo o arrrastre un contacto a la lista:"
 
-#.
-#. * 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/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr "_Ocultar direcciónes al mandar correo a esta lista"
 
-#: addressbook/gui/component/e-address-popup.c:579
-msgid "Select an Action"
-msgstr "Elija un archivo"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "_Remove"
+msgstr "_Quitar"
 
-#: 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."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Un control Bonobo para mostrar una dirección."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Un control Bonobo de ejemplo que muestra una agenda."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control que muestra minitarjetas de direcciones en Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visor de Minitarjetas de Direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Componente de Evolution para manejar contactos."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Factoría para el controlde Minitarjetas de Direcciones"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Factoría para el visualizador de direcciones de la Agenda"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Factoría para la ventana de direcciones de la Agenda"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Factoría para el componente de agenda de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Factoría para el control de ejemplo de la Agenda"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "contact-list-editor"
+msgstr "editor-de-listas-de-contactos"
 
-#: 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:272 shell/e-shortcuts-view.c:475
-msgid "Remove"
-msgstr "Quitar"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
-msgid "Remove All"
-msgstr "Quitar Todas"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
-msgid "Send HTML Mail?"
-msgstr "¿Enviar correo en HTML?"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Interfaz de Evolutión de selección de nombre de la agenda."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-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 "Message Recipients"
-msgstr "Lista de destinatarios"
-
-#: 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 "_Category:"
-msgstr "_Categoría:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Buscar"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+msgid "Contact List Editor"
+msgstr "Editor de Lastas de Contactos"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
@@ -1305,6 +1332,70 @@ msgstr "Imprimir"
 msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr "Error modificando tarjeta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr "Exito"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
+msgid "Unknown error"
+msgstr "Error desconocido"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr "Repositorio desconectado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:475
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr "Tarjeta no encontrada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr "Ya existe el ID de la tarjeta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr "Protocolo no soportado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+msgid "Canceled"
+msgstr "Cancelado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+msgid "Other error"
+msgstr "Otro error"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding list"
+msgstr "Error añadiendo lista"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding card"
+msgstr "Error añadiendo tarjeta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr "Error modificando lista"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+msgid "Error removing list"
+msgstr "Error eliminando lista"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+msgid "Error removing card"
+msgstr "Error eliminando tarjeta"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:700
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aquí para añadir un contacto *"
@@ -1425,18 +1516,10 @@ msgstr "URL de disponibilidad"
 msgid "Done."
 msgstr "Hecho."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-msgid "Error removing card"
-msgstr "Error eliminando tarjeta"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1114
 msgid "Removing cards..."
 msgstr "Eliminando tarjetas..."
 
-#: addressbook/gui/widgets/e-minicard.c:451
-msgid "Error modifying card"
-msgstr "Error modificando tarjeta"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Guardar en la agenda de direcciones"
@@ -1638,22 +1721,37 @@ 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: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/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Un control bonobo de ejemplo que muestra un calendario."
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:914
-msgid "Snooze"
-msgstr "Recordatorio"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Componente de resumen de trabajo de Evolution."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:927
-#: calendar/gui/alarm-notify/alarm-queue.c:982
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Visor del calendario iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Componente de Evolutión para manejar el calendario."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Factoría para el componente de Resumen de Calendario."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Factoría para el componente de calendario de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Factoría para el control de vista de calendario iTip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Factoría para el control del Calendario de ejemplo"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1733,7 +1831,8 @@ msgstr "No hay un sumario disponible."
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution.xml.h:4
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1741,10 +1840,27 @@ msgstr "Cerrar"
 msgid "Edit appointment"
 msgstr "Editas una cita"
 
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify/alarm-queue.c:914
+msgid "Snooze"
+msgstr "Recordatorio"
+
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "Snooze time (minutes)"
 msgstr "Tiempo de recordatorio (minutos)"
 
+#: 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 "
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:927
+#: calendar/gui/alarm-notify/alarm-queue.c:982
+msgid "Ok"
+msgstr "Ok"
+
 #: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
@@ -1823,20 +1939,20 @@ msgstr "W"
 
 #: 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:448 mail/message-list.c:620
+#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:625
 msgid "High"
 msgstr "Alta"
 
 #: 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:449 mail/message-list.c:619
+#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
 #: 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:450 mail/message-list.c:618
+#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:623
 msgid "Low"
 msgstr "Baja"
 
@@ -1904,12 +2020,15 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: 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
+#: calendar/gui/calendar-model.c:1258
+#: calendar/gui/dialogs/e-timezone-dialog.c:197
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:425 calendar/gui/e-calendar-table.c:500
+#: mail/mail-account-gui.c:1360 mail/mail-accounts.c:129
+#: mail/mail-accounts.c:380 mail/mail-config.glade.h:56
+#: shell/e-shell-view.c:1402 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"
 
@@ -1958,10 +2077,90 @@ msgstr "Si"
 msgid "No"
 msgstr "No"
 
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+msgid "Day View"
+msgstr "Vista Diaria"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
+msgstr "Vista de la Semana Laboral"
+
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
+msgstr "Vista Semanal"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+msgid "Month View"
+msgstr "Vista Mensual"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrará el calendario"
 
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
+msgstr "Opciones de las Alarmas Auditivas"
+
+#: calendar/gui/dialogs/alarm-options.c:363
+msgid "Message Alarm Options"
+msgstr "Opciones de los Mensajes de Alarma"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
+msgstr "Opciones de las Alarmas de Correo"
+
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr "Opciones de las Alarmas de Correo"
+
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr "Opciones de Alarmas Desconocidas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr "Repetición de Alarmas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr "ARREGLAME: opciones de las alarmas de correo"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
+msgstr "Mensajes a Mostrar"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
+msgstr "Tocar un sonido:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr "Repetir la alarma"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
+msgstr "Ejecutar programa:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr "Con estos argumentos:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:81
+msgid "days"
+msgstr "días"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr "extra tiempo cada"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:82
+msgid "hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:83
+msgid "minutes"
+msgstr "minutos"
+
 #: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d days"
@@ -2075,12 +2274,11 @@ msgstr "Recordatorios"
 msgid "Summary:"
 msgstr "Resumen:"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
 msgid "after"
 msgstr "después de"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:36
 msgid "before"
 msgstr "antes"
 
@@ -2097,7 +2295,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:104
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:105
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -2137,7 +2335,8 @@ msgstr "60 minutos"
 msgid "Beep when alarm windows appear."
 msgstr "Pitar cuando aparezca la ventana de la alarma."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9 shell/e-shortcuts.c:1001
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1014
 #: ui/evolution-calendar.xml.h:4
 msgid "Calendar"
 msgstr "Calendario"
@@ -2148,15 +2347,15 @@ msgstr "Preferencias del calendario"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Color for overdue tasks"
-msgstr ""
+msgstr "Color para las tareas fuera de plazo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for tasks due today"
-msgstr ""
+msgstr "Color para las tareas para hoy"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Colors for Tasks"
-msgstr ""
+msgstr "Color para las Tareas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Compress weekends in month view"
@@ -2303,6 +2502,139 @@ msgstr "Semana Laboral"
 msgid "minutes before they occur."
 msgstr "minutos antes de que ocurra."
 
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr "El estado de la reunión a cambiado. ¿Enviar una versión actualizada?"
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "¿Esta seguro que quiere cancelar y borrar este encuentro?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "¿Esta seguro que quiere cancelar y borrar esta tarea?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "¿Esta seguro que quiere cancelar y borrar la entrada del diario `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr "Este evento ha sido borrado."
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr "Esta tarea ha sido borrada."
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr "%s  Ha hecho cambios. ¿Olvidar los cambios y cerrar el editor?"
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr "%s  No ha hecho cambios, ¿cerrar el editor?"
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr "Este evento ha cambiado."
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr "Esta tarea a cambiado."
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+"%s  Ha realizado cambios. ¿Olvidar estos cambios y actualizar el editor?"
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
+
+#: calendar/gui/dialogs/comp-editor-util.c:155
+#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
+msgid " to "
+msgstr " a "
+
+#: calendar/gui/dialogs/comp-editor-util.c:159
+#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
+msgid " (Completed "
+msgstr "(Completado "
+
+#: calendar/gui/dialogs/comp-editor-util.c:161
+#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
+msgid "Completed "
+msgstr "Completado "
+
+#: calendar/gui/dialogs/comp-editor-util.c:166
+#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
+msgid " (Due "
+msgstr " (Falta "
+
+#: calendar/gui/dialogs/comp-editor-util.c:168
+#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
+msgid "Due "
+msgstr "Falta "
+
+#: calendar/gui/dialogs/comp-editor.c:448
+msgid "Edit Appointment"
+msgstr "Editar Cita"
+
+#: calendar/gui/dialogs/comp-editor.c:453
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:456
+#, c-format
+msgid "Task - %s"
+msgstr "Tarea - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:459
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Entrada del diario - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:473
+msgid "No summary"
+msgstr "Sin resumen"
+
+#: calendar/gui/dialogs/comp-editor.c:805 mail/mail-callbacks.c:1462
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "¿Sobreescribir archivo?"
+
+#: calendar/gui/dialogs/comp-editor.c:809 mail/mail-callbacks.c:1466
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ya existe una archivo con ese nombre.\n"
+"¿Sobreescribirlo?"
+
+#: calendar/gui/dialogs/comp-editor.c:872 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..."
+
+#: calendar/gui/dialogs/comp-editor.c:1025
+msgid "Unable to obtain current version!"
+msgstr "¡Imposible obtener versión actual!"
+
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2345,20 +2677,42 @@ msgstr "¿Esta seguro que quiere borrar %d tareas?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "¿Esta seguro que quiere borrar %d entradas del diario?"
 
-#: calendar/gui/dialogs/event-editor.c:136
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
+msgstr "Selecciones un Zona Horaria"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+msgid "Selection:"
+msgstr "Sección:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr "Zona Horaria"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+"Use el botón izquierdo del ratón para hacer zoom en un area del mapa y"
+"seleccionar una zona horaria.\n"
+" Use el botón derecho del ratón para salir del zoom."
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:141
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:146
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "Recurrencia"
 
-#: calendar/gui/dialogs/event-editor.c:151
-#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 msgid "Meeting"
 msgstr "Reunión"
 
@@ -2410,6 +2764,57 @@ msgstr "Hora de _fin:"
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
+#: calendar/gui/dialogs/meeting-page.c:644
+msgid "Sent By:"
+msgstr "Enviado Por:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+msgid "Change Organizer"
+msgstr "Cambiar Organizador"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+msgid "Invite Others"
+msgstr "Invitar a Otros"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizador:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "Other Organizer"
+msgstr "Otro Organizador"
+
+#: 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: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:954
+msgid "on"
+msgstr "en"
+
+#: calendar/gui/dialogs/recurrence-page.c:980 filter/filter-datespec.c:81
+msgid "day"
+msgstr "día"
+
+#: calendar/gui/dialogs/recurrence-page.c:1110
+msgid "on the"
+msgstr "en el"
+
+#: calendar/gui/dialogs/recurrence-page.c:1118
+msgid "th"
+msgstr "º"
+
+#: calendar/gui/dialogs/recurrence-page.c:1288
+msgid "occurrences"
+msgstr "ocurrencias"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Custom recurrence"
 msgstr "Recurrencia personalizada"
@@ -2466,39 +2871,22 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "año(s)"
 
-#: 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: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:954
-msgid "on"
-msgstr "en"
-
-#: calendar/gui/dialogs/recurrence-page.c:980 filter/filter-datespec.c:81
-msgid "day"
-msgstr "día"
-
-#: calendar/gui/dialogs/recurrence-page.c:1110
-msgid "on the"
-msgstr "en el"
-
-#: calendar/gui/dialogs/recurrence-page.c:1118
-msgid "th"
-msgstr "º"
-
-#: calendar/gui/dialogs/recurrence-page.c:1288
-msgid "occurrences"
-msgstr "ocurrencias"
-
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "¿Desea guardar los cambios?"
 
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr "La información de la reunión ha cambiado. ¿Enviar versión actualizada?"
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr "La información de la tarea ha cambiado. ¿Enviar versión actualizada?"
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "Fecha Completada:"
@@ -2515,12 +2903,8 @@ msgstr "Delegado A:"
 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
+#: my-evolution/e-summary-preferences.c:895
 msgid "URL:"
 msgstr "URL:"
 
@@ -2665,22 +3049,22 @@ msgid "Edit this task"
 msgstr "Editar esta tarea"
 
 #: 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
+#: calendar/gui/e-day-view.c:3316 calendar/gui/e-week-view.c:3161
 #: 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:959 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3317 calendar/gui/e-week-view.c:3160
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3163
 #: 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: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
+#: calendar/gui/e-day-view.c:3291 calendar/gui/e-day-view.c:3320
+#: calendar/gui/e-week-view.c:3137 calendar/gui/e-week-view.c:3165
 #: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
 #: ui/evolution-mail-list.xml.h:12
 msgid "Paste"
@@ -2702,102 +3086,82 @@ msgstr "Marcar tareas como completas"
 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: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:577 calendar/gui/e-week-view.c:310
-#: calendar/gui/print.c:787
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisiónes por minuto"
 
 #. 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:285 calendar/gui/e-day-view.c:1327
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1328
 #: 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:289 calendar/gui/e-day-view.c:1341
+#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1342
 #: 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:293 calendar/gui/e-day-view.c:1354
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1355
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:3295 ui/evolution-calendar.xml.h:21
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:308
+#: 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:578 calendar/gui/e-week-view.c:311
+#: calendar/gui/print.c:787
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:3296 ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/e-day-view.c:3297 calendar/gui/e-week-view.c:3141
+#: calendar/gui/e-day-view.c:3298 calendar/gui/e-week-view.c:3144
 msgid "New All Day Event"
 msgstr "Nuevo evento para todo el día"
 
-#: calendar/gui/e-day-view.c:3302 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3303 calendar/gui/e-week-view.c:3149
 msgid "Go to Today"
 msgstr "Ir a hoy"
 
-#: calendar/gui/e-day-view.c:3304 calendar/gui/e-week-view.c:3148
+#: calendar/gui/e-day-view.c:3305 calendar/gui/e-week-view.c:3151
 msgid "Go to Date..."
 msgstr "Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3311 calendar/gui/e-week-view.c:3154
+#: calendar/gui/e-day-view.c:3312 calendar/gui/e-week-view.c:3157
 #: 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:3313 calendar/gui/e-week-view.c:3156
+#: calendar/gui/e-day-view.c:3314 calendar/gui/e-week-view.c:3159
 msgid "Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3179
 msgid "Make this Occurrence Movable"
 msgstr "Hacer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3181
 msgid "Delete this Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3332
+#: calendar/gui/e-day-view.c:3333
 msgid "Delete all Occurrences"
 msgstr "Borrar todas las Ocurrencias"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisiónes por minuto"
-
-#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
-msgid " to "
-msgstr " a "
-
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
-msgid " (Completed "
-msgstr "(Completado "
-
-#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
-msgid "Completed "
-msgstr "Completado "
-
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
-msgid " (Due "
-msgstr " (Falta "
-
-#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
-msgid "Due "
-msgstr "Falta "
-
 #: 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."
@@ -2935,21 +3299,22 @@ msgstr "No puedo cargar las tareas en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "El método necesario para cargar `%s' no esta soportado"
 
-#: calendar/gui/e-week-view.c:3139 calendar/gui/e-week-view.c:3167
-msgid "New Appointment..."
-msgstr "Nueva Cita..."
-
-#: calendar/gui/e-week-view.c:3180
-msgid "Delete All Occurrences"
-msgstr "Borrar todas las Ocurrencias"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1586
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d de %B"
 
+#: calendar/gui/e-week-view.c:3142 calendar/gui/e-week-view.c:3170
+msgid "New Appointment..."
+msgstr "Nueva Cita..."
+
+#: calendar/gui/e-week-view.c:3183
+msgid "Delete All Occurrences"
+msgstr "Borrar todas las Ocurrencias"
+
 #: calendar/gui/gnome-cal.c:219
 msgid "Summary contains"
 msgstr "El resumen contiene"
@@ -2976,38 +3341,6 @@ msgstr "No puedo abrir la carpeta en `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "El método necesario para abrir `%s' no esta soportado"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Un control bonobo de ejemplo que muestra un calendario."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Componente de resumen de trabajo de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Visor del calendario iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Componente de Evolutión para manejar el calendario."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Factoría para el componente de Resumen de Calendario."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Factoría para el componente de calendario de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Factoría para el control de vista de calendario iTip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Factoría para el control del Calendario de ejemplo"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -3064,6 +3397,10 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
+#: calendar/gui/itip-utils.c:211
+msgid "An organizer must be set."
+msgstr "Debe especificar un organizador."
+
 #: calendar/gui/print.c:451
 msgid "1st"
 msgstr "1º"
@@ -3216,7 +3553,8 @@ msgstr "Vier"
 msgid "Sa"
 msgstr "Sab"
 
-#: calendar/gui/print.c:1847 shell/e-shortcuts.c:1002
+#: calendar/gui/print.c:1847 my-evolution/e-summary-tasks.c:156
+#: my-evolution/e-summary-tasks.c:172 shell/e-shortcuts.c:1015
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tareas"
@@ -3254,7 +3592,7 @@ msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
 #: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1795 my-evolution/e-summary.c:452
+#: mail/mail-callbacks.c:1798 my-evolution/e-summary.c:478
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
@@ -3314,99 +3652,6 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr "time-now espera 0 argumentos"
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr "make-time espera 1 argumento"
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr "make-time espera que el argumento 1 sea una cadena"
-
-#: calendar/pcs/query.c:255
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "el argumento 1 de make-time debe ser una cadena ISO 8601 fecha/hora"
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day espera 2 argumentos"
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr "time-add-day espera que el argumento 1 sea de tipo time_t"
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr "time-add-day espera que el argumento 2 sea un entero"
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin espera 1 argumento"
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr "time-day-begin espera que el argumento 1 sea de tipo time_t"
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr "time-day-end espera 1 argumento"
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "time-day-end espera que el argumento 1 sea de tipo time_t"
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype espera 0 argumentos"
-
-#: calendar/pcs/query.c:485
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr "occur-in-time-range? espera 2 argumentos"
-
-#: 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: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:627
-msgid "contains? expects 2 arguments"
-msgstr "contains? espera 2 argumentos"
-
-#: 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:639
-msgid "contains? expects argument 2 to be a string"
-msgstr "contains? espera que el argumento 2 sea una cadena"
-
-#: calendar/pcs/query.c:656
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-"contains? espera que el argumento 1 este entre \"any\", \"summary\", "
-"\"description\""
-
-#: calendar/pcs/query.c:694
-msgid "has-categories? expects at least 1 argument"
-msgstr "has-categories? espera al menos 1 argumento"
-
-#: 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: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"
-
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Firmar no esta soportado por este cifrado"
@@ -3427,6 +3672,29 @@ msgstr "La encriptación no está soportada por este cifrado"
 msgid "Decryption is not supported by this cipher"
 msgstr "La desencriptación no está soportada por este cifrado"
 
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+"No puede abrir `%s':\n"
+"%s\n"
+"Los cambios echos a esta carpeta no serán resincronizados."
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr "Resincronizando con el servidor"
+
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en línea para competar esta operación"
@@ -3521,6 +3789,23 @@ msgstr "Realizando búsqueda en cabezera desconocida: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inválido en el contenido del cuerpo, esperando una cadena"
 
+#: camel/camel-lock-client.c:110
+msgid "Cannot build locking helper pipe: %s"
+msgstr "No pude crear un conducto(pipe) para la ayuda: %s"
+
+#: camel/camel-lock-client.c:123
+msgid "Cannot fork locking helper: %s"
+msgstr "No puedo hacer un fork del ayudante de bloqueo: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "No puedo bloquear '%s': error de protocolo con el ayudante de bloqueo"
+
+#: camel/camel-lock-client.c:212
+msgid "Could not lock '%s'"
+msgstr "No puedo bloquear '%s'"
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
@@ -3596,54 +3881,54 @@ msgstr "(Error desconocido)"
 msgid "Error copying mail temp file: %s"
 msgstr "Error copiando el correo al archivo temporal: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Por favor introduzca su frase de paso%s %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Por favor introduzca su frase de paso %s"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 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:1060 camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 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:1067
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "No pude comunicar con GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "No hay ningún texto plano para firmar."
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "No hay ningún texto plano a verificar."
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "No pude crear archivo temporal: %s"
 
-#: camel/camel-pgp-context.c:1050
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "No hay ningún texto plano a encriptar."
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "No ha especificado destinatarios"
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "No hay ningún texto cifrado a desencriptar."
 
@@ -3925,27 +4210,17 @@ msgstr "Error al verificar el certificado."
 msgid "Trash"
 msgstr "Papelera"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"EMail: %s\n"
-"Nombre: %s\n"
-"Departamento: %s\n"
-"Organización: %s\n"
-"Localidad: %s\n"
-"Estado: %s\n"
-"País: %s"
+"Responsable: %s\n"
+"Asunto: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:431 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3960,26 +4235,36 @@ msgstr ""
 "\n"
 "¿Quieres aceptarlo de todos modos?"
 
-#: camel/camel-tcp-stream-openssl.c:426
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"Responsable: %s\n"
-"Asunto: %s"
+"EMail: %s\n"
+"Nombre: %s\n"
+"Departamento: %s\n"
+"Organización: %s\n"
+"Localidad: %s\n"
+"Estado: %s\n"
+"País: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "No pude analizar la URL `%s'"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No existe el mensaje %s en %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "No existe el mensaje: %s"
@@ -3988,11 +4273,6 @@ msgstr "No existe el mensaje: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "No puede copiar mensajes de esta papelera."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "No puedo abrir directorio de cache: %s"
-
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -4003,10 +4283,6 @@ msgstr "Respuesta inesperada del servidor IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Error desconocido"
-
 #: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "La respuesta del servidor terminó demasiado pronto."
@@ -4048,6 +4324,11 @@ msgstr "Este mensaje no está disponible actualmente"
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "No puedo abrir directorio de cache: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
 msgid "Checking for new mail"
 msgstr "Comprobando si hay correo nuevo"
@@ -4158,6 +4439,7 @@ msgid "For storing local mail in standard Unix spool directories"
 msgstr "Para guardar el correo local en directorios estandar de Unix"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La dirección %s no es absoluta"
@@ -4198,6 +4480,7 @@ msgid "Could not delete folder index file `%s': %s"
 msgstr "No pude borrar el índice de la carpeta `%s': %s"
 
 #: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No pude añadir mensajes al resumen: razón desconocida"
 
@@ -4213,6 +4496,7 @@ msgstr "No pude añadir el mensaje a la carpeta tipo maildir: %s: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4224,6 +4508,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "No existe ese mensaje"
 
@@ -4233,7 +4518,7 @@ msgstr "No existe ese mensaje"
 msgid "Invalid message contents"
 msgstr "Contenido inválido en el mensaje"
 
-#: camel/providers/local/camel-maildir-store.c:101
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4243,14 +4528,14 @@ msgstr ""
 "No pude abrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existe."
 
-#: camel/providers/local/camel-maildir-store.c:112
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4260,23 +4545,23 @@ msgstr ""
 "No pude crear la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:127
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' no es un directorio tipo maildir."
 
-#: camel/providers/local/camel-maildir-store.c:156
-#: camel/providers/local/camel-maildir-store.c:193
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No pude borrar la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "no es un directorio tipo maildir"
 
-#: camel/providers/local/camel-maildir-store.c:267
+#: camel/providers/local/camel-maildir-store.c:276
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "No pude parsear la carpeta `%s': %s"
@@ -4288,11 +4573,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "No puedo abrir el maildir en esta ruta: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No puedo crear un bloqueo de carpetas en %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No puedo abrir el buzón: %s: %s\n"
@@ -4305,6 +4592,9 @@ msgstr "No puedo añadir el mensaje al archivo mbox: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4314,10 +4604,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La carpeta parece estar corrompida e irrecuperable."
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallo la construcción del mensaje: ¿Buzón corrompido?"
 
@@ -4363,36 +4655,45 @@ msgstr "La carpeta `%s' no esta vacía. No fue borrada."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Resumiendo carpeta"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "No pude abrir la carpeta: %s: resumiendo desda la posición %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Parseado erróneo del correo cerca de la posición %ld en la carpeta %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 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:1461
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1468
 msgid "Synchronising folder"
 msgstr "Sincronizando carpeta"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "No pude abrir la carpeta para resumirla: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No puedo abrir el archivo de correo temporal: %s"
@@ -4401,21 +4702,28 @@ msgstr "No puedo abrir el archivo de correo temporal: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Resumen y carpeta no concuerdan, incluso después de una sincronización"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error la escribir al archivo de correo temporal: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error la escribir al archivo temporal: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No pude cerrar la carpeta origen %s: %s"
@@ -4431,6 +4739,8 @@ msgid "Could not rename folder: %s"
 msgstr "No pude cambiar el nombre a la carpeta: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
@@ -4450,6 +4760,55 @@ msgstr "`%s' no es un directorio."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "No puedo abrir el directorio MH en la ruta: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "No puedo añadir el mensaje al archivo: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' no existe o no es un archivo normal."
+
+#: camel/providers/local/camel-spool-store.c:159
+msgid "Folder `%s/%s' does not exist."
+msgstr "La carpeta `%s/%s' no existe."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr "Los almacenadores locales no tienen una carpeta de entrada"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Archivo de correo local %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+msgid "Could not sync temporary folder %s: %s"
+msgstr "No pude sincronizar la carpeta temporal %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "No pude parsear la carpeta `%s': %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -4658,7 +5017,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:82
+#: mail/mail-config.glade.h:83
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4711,7 +5070,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:75
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:76
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5015,10 +5374,69 @@ msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automaticamente"
 
-#: composer/e-msg-composer.c:667
+#: 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:356
+msgid "From:"
+msgstr "De:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:362
+msgid "Reply-To:"
+msgstr "Responder a:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:373
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: composer/e-msg-composer-hdrs.c:387
+msgid "To:"
+msgstr "A:"
+
+#: 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:391
+msgid "Cc:"
+msgstr "Cc:"
+
+#: 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:395
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: 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."
+msgstr ""
+"Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
+"la lista de destinatarios del mensaje."
+
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Adjuntar un fichero"
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5027,7 +5445,7 @@ msgstr ""
 "No puedo abrir el archivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:680
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5036,30 +5454,29 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:866
+#: composer/e-msg-composer.c:869
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:875
-#, fuzzy
+#: composer/e-msg-composer.c:878
 msgid "Warning!"
-msgstr "Aviso"
+msgstr "¡Aviso!"
 
-#: composer/e-msg-composer.c:877
+#: composer/e-msg-composer.c:880
 msgid "File exists, overwrite?"
-msgstr ""
+msgstr "El archivo existe, ¿Sobreescribir?"
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:902
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:922
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:993
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5067,16 +5484,16 @@ 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:1040
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1057
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5085,7 +5502,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1060
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5094,7 +5511,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1072
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5103,18 +5520,20 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1146
+#: composer/e-msg-composer.c:1169
 msgid ""
-"Evolution has detected an editor buffer from a previous session.\n"
-"Would you like to recover this buffer?"
+"Evolution has found unsaved files from a previous sesiion.\n"
+"Would you like to attempt recovery?"
 msgstr ""
+"Evolution ha encontrado archivos no guardados de sesiones previas.\n"
+"¿Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1299 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1318 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:231
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1305
+#: composer/e-msg-composer.c:1324
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5124,75 +5543,22 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1330
+#: composer/e-msg-composer.c:1349
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1479
+#: composer/e-msg-composer.c:1498
 msgid "Insert File"
 msgstr "Insertar Archivo"
 
-#: composer/e-msg-composer.c:1836 composer/e-msg-composer.c:2212
+#: composer/e-msg-composer.c:1855 composer/e-msg-composer.c:2243
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2306
+#: composer/e-msg-composer.c:2337
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
-#: 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:356
-msgid "From:"
-msgstr "De:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:362
-msgid "Reply-To:"
-msgstr "Responder a:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:373
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "To:"
-msgstr "A:"
-
-#: 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:391
-msgid "Cc:"
-msgstr "Cc:"
-
-#: 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:395
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: 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."
-msgstr ""
-"Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
-"la lista de destinatarios del mensaje."
-
 #: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -5293,26 +5659,14 @@ msgstr "semana"
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "días"
-
 #: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "horas"
-
 #: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minutos"
-
 #: filter/filter-datespec.c:84
 msgid "second"
 msgstr "segundo"
@@ -5405,7 +5759,7 @@ msgstr ""
 "Por favor vuelve y especifica una carpeta válida donde entregar el correo."
 
 #: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:701
+#: mail/mail-account-gui.c:766
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -5417,46 +5771,6 @@ msgstr "Escribir URI de la carpeta"
 msgid "<click here to select a folder>"
 msgstr "<pinche aquí para seleccionar una carpeta>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Editar filtros"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Editar carpeta virtual"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Entrando"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Saliente"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Carpetas virtuales"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "solo carpetas especificadas"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "Fuentes de la carpeta virtual"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "con todas las carpetas remotas activas"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "con todas las carpetas locales y remotas activas"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "con todas las carpetas locales"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5478,229 +5792,269 @@ msgstr "Nombre de la regla:"
 msgid "Untitled"
 msgstr "Sin título"
 
-#: filter/filter-rule.c:647
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:665
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Ejecutar acciones"
 
-#: filter/filter-rule.c:669
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
-#: filter/filter-rule.c:674
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "si se cumple algún criterio"
 
-#: filter/filter-rule.c:685
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Añadir criterio"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "saliente"
 
-#: filter/libfilter-i18n.h:3
-#, fuzzy
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Editar filtros"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Editar carpeta virtual"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Entrando"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Saliente"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Carpetas virtuales"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "solo carpetas especificadas"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "Fuentes de la carpeta virtual"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "con todas las carpetas remotas activas"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "con todas las carpetas locales y remotas activas"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "con todas las carpetas locales"
+
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Color"
-msgstr "Asignar color"
+msgstr "Asignar Color"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Asignar puntuación"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Fecha de recepción"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Fecha de envío"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Borrado"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "no contiene"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "no acaba en"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "no existe"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "no suena como"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "no comienza por"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "No Existe"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "finaliza con"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "Salir"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Expresión"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "Reenviar a dirección"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:15
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:26
-msgid "is"
-msgstr "es"
-
-#: filter/libfilter-i18n.h:27
-msgid "is greater than"
-msgstr "es mayor que"
-
-#: filter/libfilter-i18n.h:28
-msgid "is less than"
-msgstr "es menor que"
-
-#: filter/libfilter-i18n.h:29
-msgid "is not"
-msgstr "no es"
-
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was received"
 msgstr "Se recibió el mensaje"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Message was sent"
 msgstr "Se envió el mensaje"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:21
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: filter/libfilter-i18n.h:36
-msgid "on or after"
-msgstr "en o después de"
-
-#: filter/libfilter-i18n.h:37
-msgid "on or before"
-msgstr "en o antes de"
-
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Read"
 msgstr "Leído"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Regex Match"
 msgstr "Expresión regular"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:25
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:26 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:6
 msgid "Score"
 msgstr "Puntuación"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1062
+#: filter/libfilter-i18n.h:27 mail/mail-callbacks.c:1062
 msgid "Sender"
 msgstr "Remitente"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:29
 msgid "Size (kB)"
 msgstr "Tamaño (kB)"
 
-#: filter/libfilter-i18n.h:46
-msgid "sounds like"
-msgstr "suena como"
-
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Source Account"
 msgstr "Fuente de la cuenta"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:31
 msgid "Specific header"
 msgstr "Cabecera específica"
 
-#: filter/libfilter-i18n.h:49
-msgid "starts with"
-msgstr "comienza por"
-
-#: filter/libfilter-i18n.h:50 mail/message-list.etspec.h:8
+#: filter/libfilter-i18n.h:32 mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Estado"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:33
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:776
+#: filter/libfilter-i18n.h:34 mail/mail-format.c:861
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
+#: filter/libfilter-i18n.h:37
+msgid "contains"
+msgstr "contiene"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not contain"
+msgstr "no contiene"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not end with"
+msgstr "no acaba en"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not exist"
+msgstr "no existe"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not sound like"
+msgstr "no suena como"
+
+#: filter/libfilter-i18n.h:42
+msgid "does not start with"
+msgstr "no comienza por"
+
+#: filter/libfilter-i18n.h:43
+msgid "ends with"
+msgstr "finaliza con"
+
+#: filter/libfilter-i18n.h:44
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:45
+msgid "is greater than"
+msgstr "es mayor que"
+
+#: filter/libfilter-i18n.h:46
+msgid "is less than"
+msgstr "es menor que"
+
+#: filter/libfilter-i18n.h:47
+msgid "is not"
+msgstr "no es"
+
+#: filter/libfilter-i18n.h:48
+msgid "is"
+msgstr "es"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or after"
+msgstr "en o después de"
+
+#: filter/libfilter-i18n.h:50
+msgid "on or before"
+msgstr "en o antes de"
+
+#: filter/libfilter-i18n.h:51
+msgid "sounds like"
+msgstr "suena como"
+
+#: filter/libfilter-i18n.h:52
+msgid "starts with"
+msgstr "comienza por"
+
 #: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "estaba después de"
@@ -5725,7 +6079,7 @@ msgstr "Editar Regla"
 msgid "Score Rules"
 msgstr "Reglas de puntuación"
 
-#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:224
+#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:228
 #: 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
@@ -5733,7 +6087,7 @@ msgid "Import"
 msgstr "Importar"
 
 #: importers/elm-importer.c:506 importers/netscape-importer.c:774
-#: importers/pine-importer.c:643
+#: importers/pine-importer.c:643 my-evolution/my-evolution.glade.h:12
 msgid "Mail"
 msgstr "Correo"
 
@@ -5741,9 +6095,8 @@ msgstr "Correo"
 msgid "Elm Aliases"
 msgstr "Alias de Elm"
 
-#: 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
+#: importers/elm-importer.c:517 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"
 
@@ -5759,11 +6112,11 @@ msgstr ""
 msgid "Elm mail"
 msgstr "Correo de Elm"
 
-#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:653
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:653
 msgid "Addressbook"
 msgstr "Agenda de direcciones"
 
-#: importers/evolution-gnomecard-importer.c:261
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5775,7 +6128,7 @@ msgstr ""
 msgid "Settings"
 msgstr "Configuración"
 
-#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1707
+#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1710
 msgid "Filters"
 msgstr "Filtros"
 
@@ -5803,183 +6156,187 @@ msgstr ""
 msgid "Pine mail"
 msgstr "Correo de Pine"
 
-#: mail/component-factory.c:684
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Componente Evolution para manejar el correo."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Componente de correo del resumen de trabajo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Componente para mostar carpetas de correo de Evolution"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Componente para factoría de carpetas de correo de Evolution"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Factoría para el compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Factoría para el componente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Factoría para el componente de Resumen de Correo."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "Interface de configuración del correo"
+
+#: mail/component-factory.c:679
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:818
+#: mail/component-factory.c:813
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser.c:211 mail/mail-display.c:268
+#: mail/folder-browser-ui.c:253
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Propiedades para \"%s\""
+
+#: mail/folder-browser-ui.c:255
+msgid "Properties"
+msgstr "Propiedades"
+
+#: mail/folder-browser.c:227 mail/mail-display.c:277
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/folder-browser.c:830
+#: mail/folder-browser.c:884
 msgid "Store search as vFolder"
 msgstr "Guardar la búsqueda como una carpeta virtual"
 
-#: mail/folder-browser.c:1173
+#: mail/folder-browser.c:1227
 msgid "VFolder on _Subject"
 msgstr "VFolder según el a_sunto"
 
-#: mail/folder-browser.c:1176
+#: mail/folder-browser.c:1230
 msgid "VFolder on Se_nder"
 msgstr "VFolder según el _remitente"
 
-#: mail/folder-browser.c:1179
+#: mail/folder-browser.c:1233
 msgid "VFolder on _Recipients"
 msgstr "VFolder según los _destinatarios"
 
-#: mail/folder-browser.c:1182
+#: mail/folder-browser.c:1236
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual según la _Lista de Correo"
 
-#: mail/folder-browser.c:1188
+#: mail/folder-browser.c:1242
 msgid "Filter on Sub_ject"
 msgstr "Filtrar según el As_unto"
 
-#: mail/folder-browser.c:1191
+#: mail/folder-browser.c:1245
 msgid "Filter on Sen_der"
 msgstr "Filtrar según el Re_mitente"
 
-#: mail/folder-browser.c:1194
+#: mail/folder-browser.c:1248
 msgid "Filter on Re_cipients"
 msgstr "Filtrar según los Des_tinatarios"
 
-#: mail/folder-browser.c:1197
+#: mail/folder-browser.c:1251
 msgid "Filter on _Mailing List"
 msgstr "Filtrar según la Lista de _Correo"
 
-#: mail/folder-browser.c:1206
+#: mail/folder-browser.c:1260
 msgid "_Open"
 msgstr "_Abrir"
 
-#: mail/folder-browser.c:1208
+#: mail/folder-browser.c:1262
 msgid "Resend"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:1210 ui/evolution-calendar.xml.h:54
+#: mail/folder-browser.c:1264 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:1212 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1266 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1217 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1271 ui/evolution-mail-message.xml.h:85
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1219 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1273 ui/evolution-mail-message.xml.h:61
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1221 ui/evolution-mail-message.xml.h:60
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:60
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1223
+#: mail/folder-browser.c:1277
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1226
+#: mail/folder-browser.c:1280
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: mail/folder-browser.c:1228
+#: mail/folder-browser.c:1282
 msgid "Mark as U_nread"
 msgstr "Marcar como _no leído"
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1284
+msgid "Mark as _Important"
+msgstr "Marcar como _Importante"
+
+#: mail/folder-browser.c:1289
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1235
+#: mail/folder-browser.c:1291
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1239 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:87
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1300
 msgid "Add Sender to Address Book"
 msgstr "Añadir Remitente a la Agenda de Direcciones"
 
-#: mail/folder-browser.c:1249
+#: mail/folder-browser.c:1305
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1309
 msgid "Create Ru_le From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1448
 msgid "Filter on Mailing List"
 msgstr "Filtrar según la lista de correo"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1449
 msgid "VFolder on Mailing List"
 msgstr "Carpeta virtual según la Lista de Correo"
 
-#: mail/folder-browser.c:1395
+#: mail/folder-browser.c:1451
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar según la lista de correo (%s)"
 
-#: mail/folder-browser.c:1396
+#: mail/folder-browser.c:1452
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Carpeta virtual según la Lista de Correo (%s)"
 
-#: mail/folder-browser-ui.c:253
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Propiedades para \"%s\""
-
-#: mail/folder-browser-ui.c:255
-msgid "Properties"
-msgstr "Propiedades"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Componente Evolution para manejar el correo."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Componente de correo del resumen de trabajo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Componente para mostar carpetas de correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Componente para factoría de carpetas de correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Factoría para el compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Factoría para el componente de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Factoría para el componente de Resumen de Correo."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "Interface de configuración del correo"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Factoría para importar archivos de mbox a Evolution."
@@ -6031,20 +6388,25 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+msgid "Evolution News Editor"
+msgstr "Editor de Noticias de Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:891
+#: mail/mail-account-gui.c:956
 msgid "Save signature"
 msgstr "Guardar firma"
 
-#: mail/mail-account-gui.c:897
+#: mail/mail-account-gui.c:962
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6075,7 +6437,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "¿Esta seguro que quiere borrar esta cuenta de noticias?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:703
+#: mail/mail-accounts.c:709
 msgid "Evolution Account Manager"
 msgstr "Administrador de cuentas de Evolution"
 
@@ -6150,6 +6512,10 @@ msgid ""
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
+"Este mensaje solo contiene destinatarios en el Cco.\n"
+"Es posible que el servidor de correo revele los destinatarios añadiendo una "
+"cabecera Apparently-To.\n"
+"¿Enviar de todos modos?"
 
 #: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
@@ -6159,29 +6525,29 @@ msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 msgid "You must configure an account before you can send this email."
 msgstr "Debe configurar una cuenta antes de poder enviar este mensaje."
 
-#: mail/mail-callbacks.c:655
+#: mail/mail-callbacks.c:656
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "El día %s, %s escribió:"
 
-#: mail/mail-callbacks.c:887
+#: mail/mail-callbacks.c:888
 msgid "Forwarded message:\n"
 msgstr "Mensaje reenviado:\n"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:982
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:983
+#: mail/mail-callbacks.c:984
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:1338
+#: mail/mail-callbacks.c:1339
 #, 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:1360
+#: mail/mail-callbacks.c:1361
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6189,7 +6555,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:1394
+#: mail/mail-callbacks.c:1395
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6197,36 +6563,24 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:1406
+#: mail/mail-callbacks.c:1407
 #, 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:1427
+#: mail/mail-callbacks.c:1428
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:1461 mail/mail-display.c:98
-msgid "Overwrite file?"
-msgstr "¿Sobreescribir archivo?"
-
-#: mail/mail-callbacks.c:1465 mail/mail-display.c:102
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ya existe una archivo con ese nombre.\n"
-"¿Sobreescribirlo?"
-
-#: mail/mail-callbacks.c:1509
+#: mail/mail-callbacks.c:1510
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:1511
+#: mail/mail-callbacks.c:1512
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:1697
+#: mail/mail-callbacks.c:1700
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6235,23 +6589,19 @@ msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1755
+#: mail/mail-callbacks.c:1758
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1805
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresión del mensaje"
 
-#: mail/mail-callbacks.c:1897
+#: mail/mail-callbacks.c:1900
 #, 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:1540 mail/mail-config.c:1543
-msgid "Connecting to server..."
-msgstr "Conectando al servidor..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6297,10 +6647,14 @@ msgstr ""
 "usará para mostrar información."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:463
 msgid "Evolution Account Wizard"
 msgstr "Configurador de cuentas de Evolution"
 
+#: mail/mail-config.c:1563 mail/mail-config.c:1566
+msgid "Connecting to server..."
+msgstr "Conectando al servidor..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Comprobar tipos soportados "
@@ -6416,7 +6770,7 @@ msgstr "Dirección de correo:"
 
 #: mail/mail-config.glade.h:36
 msgid "Empty trash folders on exit"
-msgstr ""
+msgstr "Vaciar papelera al salir"
 
 #: mail/mail-config.glade.h:38
 msgid "Full Name:"
@@ -6507,9 +6861,8 @@ msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
 #: 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"
+msgstr "Preguntar al mandar mensajes con el asunto vacio"
 
 #: mail/mail-config.glade.h:68
 msgid "Qmail maildir "
@@ -6531,95 +6884,100 @@ msgstr "Recibiendo Mensajes"
 msgid "Receiving Options"
 msgstr "Recibiendo Opciones"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
+msgid "Remember PGP Passphrase until exit"
+msgstr "Recordar la frase de paso de PGP hasta salir del programa"
+
+#: mail/mail-config.glade.h:75
 msgid "Required Information"
 msgstr "Información Requerida"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Secure MIME"
 msgstr "MIME seguro"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Security"
 msgstr "Seguridad"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Select PGP binary"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Send mail in HTML format by default."
 msgstr "Enviar por defecto el mensaje en formato HTML"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Sent"
 msgstr "Enviado"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:86
 msgid "Sent messages folder:"
 msgstr "Carpeta de mensajes enviados:"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Server Type: "
 msgstr "Tipo de servidor:"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Server requires authentication"
 msgstr "El servidor requiere autentificación"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Signature file:"
 msgstr "Archivo de firma:"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Source"
 msgstr "Fuente"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Source Information"
 msgstr "Información de la Fuente"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Sources"
 msgstr "Fuentes"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Special Folders"
 msgstr "Carpetas Especiales"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Standard Unix mbox"
 msgstr "Mabox estándar de Unix"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
+#: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "Use secure connection (SSL)"
 msgstr "Use conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "Username:"
 msgstr "Nombre:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6629,58 +6987,59 @@ msgstr ""
 "\n"
 "Pulse \"Siguiente\" para comenzar. "
 
-#: mail/mail-config.glade.h:103 ui/evolution-comp-editor.xml.h:20
+#: mail/mail-config.glade.h:104 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-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution.xml.h:46
 msgid "_Edit"
 msgstr "_Editar"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "newswindow1"
-msgstr ""
+msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "placeholder"
 msgstr "placeholder"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "seconds."
 msgstr "segundos."
 
-#: mail/mail-crypto.c:59
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "No pude crear un contexto de firma PGP."
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "No pude crear un contexto de verificación PGP."
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "No pude crear un contexto de encriptación PGP."
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "No pude crear un contexto de desencriptación PGP."
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "No pude crear un contexto de firma S/MIME."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr "No pude crear un contexto de certificado S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "No pude crear un contexto de encriptación S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr "No pude crear un contexto sobre tipo S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
 msgstr "No pude crear un contexto de decodificación S/MIME."
 
@@ -6688,128 +7047,147 @@ msgstr "No pude crear un contexto de decodificación S/MIME."
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:337
 msgid "Save to Disk..."
 msgstr "Guardar en disco..."
 
-#: mail/mail-display.c:332
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %s..."
-
-#: mail/mail-display.c:334
+#: mail/mail-display.c:339
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:369
-msgid "External Viewer"
-msgstr "Visores externos"
+#: mail/mail-display.c:341
+#, c-format
+msgid "Open in %s..."
+msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:398
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (vía %s)"
 
-#: mail/mail-display.c:396
+#: mail/mail-display.c:402
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:1028
+#: mail/mail-display.c:423
+msgid "External Viewer"
+msgstr "Visores externos"
+
+#: mail/mail-display.c:1054
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1371
+#: mail/mail-display.c:1397
 msgid "Open Link in Browser"
 msgstr "Abrir Enlaze en el Navegador"
 
-#: mail/mail-display.c:1373
+#: mail/mail-display.c:1399
 msgid "Copy Link Location"
 msgstr "Copiar Dirección del Enlaze"
 
-#: mail/mail-display.c:1375
+#: mail/mail-display.c:1401
 msgid "Save Link as (FIXME)"
 msgstr "Guardar Enlaze como (ARREGLAME)"
 
-#: mail/mail-display.c:1377
+#: mail/mail-display.c:1403
 msgid "Save Image as"
 msgstr "Guardar Imagen como..."
 
-#: mail/mail-format.c:532
+#: mail/mail-folder-cache.c:164
+#, fuzzy, c-format
+msgid "%d new"
+msgstr "%d nuevos"
+
+#: mail/mail-folder-cache.c:170 mail/mail-folder-cache.c:177
+msgid ", "
+msgstr ", "
+
+#: mail/mail-folder-cache.c:171
+#, c-format
+msgid "%d hidden"
+msgstr "%d ocultos"
+
+#: mail/mail-folder-cache.c:178
+#, c-format
+msgid "%d total"
+msgstr "%d total"
+
+#: mail/mail-format.c:603
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:652
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:649 mail/message-list.etspec.h:2
+#: mail/mail-format.c:734 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:765 mail/message-list.etspec.h:4
+#: mail/mail-format.c:850 mail/message-list.etspec.h:4
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:768
+#: mail/mail-format.c:853
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:771 mail/message-list.etspec.h:10
+#: mail/mail-format.c:856 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:774
+#: mail/mail-format.c:859
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1182
 msgid "No GPG/PGP program configured."
 msgstr "No hay programas GPG/PGP configurados."
 
-#: mail/mail-format.c:1111
+#: mail/mail-format.c:1197
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:1117
+#: mail/mail-format.c:1203
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:1118
+#: mail/mail-format.c:1204
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1174
+#: mail/mail-format.c:1260
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Este mensaje está firmado digitalmente y es auténtico."
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1268
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Este mensaje está firmado digitalmente pero no se puede verificar su "
 "autenticidad."
 
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:1920
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:1845
+#: mail/mail-format.c:1932
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) valido en \"%s\""
 
-#: mail/mail-format.c:1849
+#: mail/mail-format.c:1936
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:1883
+#: mail/mail-format.c:1970
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1888
+#: mail/mail-format.c:1975
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
@@ -6947,52 +7325,52 @@ msgstr "Copiando"
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en \"%s\""
 
-#: mail/mail-ops.c:1134
+#: mail/mail-ops.c:1141
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1175 mail/mail-ops.c:1313
+#: mail/mail-ops.c:1182 mail/mail-ops.c:1320
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1242
+#: mail/mail-ops.c:1249
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1381
+#: mail/mail-ops.c:1388
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1520
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1549
+#: mail/mail-ops.c:1556
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1605
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1672
 msgid "Retrieving messages"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1682
 #, 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:1749
+#: mail/mail-ops.c:1756
 msgid "Saving messages"
 msgstr "Guardando mensajes"
 
-#: mail/mail-ops.c:1828
+#: mail/mail-ops.c:1835
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7001,12 +7379,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1841
+#: mail/mail-ops.c:1848
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Guardando mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1855
+#: mail/mail-ops.c:1862
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7015,11 +7393,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1936
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1951
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7028,12 +7406,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1979
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
@@ -7090,6 +7468,10 @@ msgstr "Enviando"
 msgid "Cancelled."
 msgstr "Cancelado"
 
+#: mail/mail-session.c:170
+msgid "User canceled operation."
+msgstr "Operación cancelada por el usuario."
+
 #: mail/mail-tools.c:159
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
@@ -7130,63 +7512,63 @@ msgstr "Carpetas virtuales"
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-list.c:608
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:609
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:610
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:611
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Multiples mensajes sin leer"
 
-#: mail/message-list.c:612
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Multiples mensajes"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:872
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:888
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
@@ -7202,10 +7584,6 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
-#: mail/mail-session.c:170
-msgid "User canceled operation."
-msgstr "Operación cancelada por el usuario."
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Carpeta"
@@ -7250,43 +7628,67 @@ msgstr "Factoría para el componente resumen de trabajo de Evolution."
 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
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:159
+#: my-evolution/e-summary-calendar.c:177
 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-calendar.c:226
+msgid "%l:%M%p"
+msgstr "%l:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+msgid "%a %l:%M%p"
+msgstr "%a %l:%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
+#: my-evolution/e-summary-preferences.c:424
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com Palabra del Día"
+
+#: my-evolution/e-summary-preferences.c:446
+msgid "Quotes of the Day"
+msgstr "Frase del Día"
+
+#: my-evolution/e-summary-preferences.c:875
+msgid "Add a news feed"
+msgstr "Añadir una fuente de noticias"
+
+#: my-evolution/e-summary-preferences.c:883
+msgid "Enter the URL of the news feed you wish to add"
+msgstr "Escriba la URL de la fuente de noticias que quiere añadir"
+
+#: my-evolution/e-summary-rdf.c:379 my-evolution/e-summary-rdf.c:405
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Error obteniendo RDF</b>"
 
+#: my-evolution/e-summary-tasks.c:157
+msgid "No tasks"
+msgstr "No hay tareas"
+
 #: my-evolution/e-summary-weather.c:56
 msgid "My Weather"
 msgstr "Mi Tiempo"
 
-#: my-evolution/e-summary-weather.c:296
+#: my-evolution/e-summary-weather.c:300
 msgid "<b>Error downloading Metar</b>"
 msgstr "<b>Error obteniendo Metar</b>"
 
-#: my-evolution/e-summary-weather.c:612
+#: my-evolution/e-summary-weather.c:616
 msgid "Regions"
 msgstr "Regiones"
 
-#: my-evolution/e-summary.c:413 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:439 ui/my-evolution.xml.h:3
 msgid "Print My Evolution"
 msgstr "Imprimir Mi Evolution"
 
-#: my-evolution/e-summary.c:459
+#: my-evolution/e-summary.c:485
 msgid "Printing of My Evolution failed"
 msgstr "La impresión de Mi Evolution ha fallado"
 
@@ -8471,6 +8873,133 @@ msgstr ""
 msgid "Drifting dust whirls"
 msgstr ""
 
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add ->"
+msgstr "Añadir"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "Add new feed"
+msgstr "Contestado"
+
+#: my-evolution/my-evolution.glade.h:3
+#, fuzzy
+msgid "All folders:"
+msgstr "Seleccionar carpeta"
+
+#: my-evolution/my-evolution.glade.h:4
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:5
+msgid "All stations:"
+msgstr "Todas las estaciones"
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display folders:"
+msgstr "Mostrar carpetas:"
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Display stations:"
+msgstr "Mostrar estaciones:"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Mostrar"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "Five days"
+msgstr "Cinco dias"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "Max number of items shown:"
+msgstr "Número máximo de elementos mostrados:"
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Configuración"
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "One day"
+msgstr "Un día"
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "One month"
+msgstr "Un mes"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "One week"
+msgstr "Una semana"
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Refresh time (seconds):"
+msgstr "Tiempo de actualización (segundos):"
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "Remove <-"
+msgstr "Quitar <-"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Schedule"
+msgstr "Horario"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show all tasks"
+msgstr "Mostrar tadas las tareas"
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "Show full path for folders"
+msgstr "Mostrar ruta completa a las carpetas"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Show today's tasks"
+msgstr "Mostrar las tareas de hoy"
+
+#: my-evolution/my-evolution.glade.h:25
+msgid "Tasks "
+msgstr "Tareas "
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Units: "
+msgstr "Unidades: "
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "Weather"
+msgstr "Tiempo"
+
+#: my-evolution/my-evolution.glade.h:28
+#, fuzzy
+msgid "Weather settings"
+msgstr "Quitar la seleccionada"
+
+#: my-evolution/my-evolution.glade.h:29
+msgid "Wipe trackers"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "imperial"
+msgstr "anglosajón"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "metric"
+msgstr "métrico"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "La shell de Evolution."
+
 #: shell/e-activity-handler.c:198
 msgid "Show Details"
 msgstr "Mostrar Detalles"
@@ -8479,7 +9008,7 @@ msgstr "Mostrar Detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar Operación"
 
-#: shell/e-setup.c:125 shell/e-setup.c:198
+#: shell/e-setup.c:125 shell/e-setup.c:195
 msgid "Evolution installation"
 msgstr "Instalación de Evolution"
 
@@ -8501,21 +9030,17 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr "No pude actualizar correctamente los archivos"
 
-#: shell/e-setup.c:173 shell/e-setup.c:241
-msgid "Evolution files successfully installed."
-msgstr "Los archivos de Evolution han sido instalados."
-
-#: shell/e-setup.c:202
+#: shell/e-setup.c:199
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Parece que esta es la primera vez que ejecuta Evolution"
 
-#: shell/e-setup.c:203
+#: shell/e-setup.c:200
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Por favor, pulse en <<Aceptar>> para instalar los archivos de usuario de "
 "Evolution en"
 
-#: shell/e-setup.c:222
+#: shell/e-setup.c:219
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -8526,16 +9051,15 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:237
-#, c-format
+#: shell/e-setup.c:234
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
-"No puedo copiar archivos en\n"
+"Ha ocurrido un error mientras se copiaban archivos a\n"
 "`%s'."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:299
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -8546,7 +9070,7 @@ msgstr ""
 "Por favor, renombre lo para permitir la instalación\n"
 "de los archivos de usuario de Evolution."
 
-#: shell/e-setup.c:318
+#: shell/e-setup.c:313
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -8560,7 +9084,7 @@ msgstr ""
 "Evolution.\n"
 "¿Quiere que borre ese directorio?"
 
-#: shell/e-setup.c:343
+#: shell/e-setup.c:338
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -8571,67 +9095,47 @@ msgstr ""
 "de Evolution. Por favor, renombre lo para permitir la\n"
 "instalación de los archivos de usuario de Evolution."
 
-#: 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:1308
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-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:159
-#, fuzzy
+#: shell/e-shell-folder-commands.c:160
 msgid "Cannot move a folder over itself."
-msgstr "No pude acceder a la carpeta: %s: %s"
+msgstr "No puedo mover una carpeta sobre si misma."
 
-#: shell/e-shell-folder-commands.c:161
-#, fuzzy
+#: shell/e-shell-folder-commands.c:162
 msgid "Cannot copy a folder over itself."
-msgstr ""
-"No puedo copiar archivos en\n"
-"`%s'."
+msgstr "No puedo copiar una carpeta sobre si misma."
 
-#: shell/e-shell-folder-commands.c:175
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder into one of its descendants."
-msgstr ""
+msgstr "No puedo mover una carpeta a uno de sus descendientes."
 
-#: shell/e-shell-folder-commands.c:269
+#: shell/e-shell-folder-commands.c:270
 #, 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:274
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "Copiar una carpeta"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:313
 #, 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:317
+#: shell/e-shell-folder-commands.c:318
 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:351
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Borrar carpeta '%s'"
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:363
 #, 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:417
+#: shell/e-shell-folder-commands.c:422
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Renombrar carpeta '%s'"
@@ -8773,39 +9277,6 @@ msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
-#: 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:1386 shell/e-storage-set-view.c:1441
-msgid "My Evolution"
-msgstr "Mi Evolution"
-
-#: shell/e-shell-view.c:1403
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1405
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: 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:1450
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution está en proceso de desconectarse."
-
-#: 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."
-
 #: shell/e-shell-view-menu.c:182
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
@@ -8852,21 +9323,52 @@ msgstr "Trabajar conectado"
 msgid "Work offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shortcuts.c:601
-msgid "Error saving shortcuts."
-msgstr "Error guardando atajos."
+#: shell/e-shell-view.c:173
+msgid "(No folder displayed)"
+msgstr "(No hay carpetas mostrándose)"
 
-#: shell/e-shortcuts.c:998
-msgid "Shortcuts"
-msgstr "Atajos"
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1391 shell/e-storage-set-view.c:1441
+msgid "My Evolution"
+msgstr "Mi Evolution"
 
-#: shell/e-shortcuts.c:1000
-msgid "Inbox"
-msgstr "Inbox"
+#: shell/e-shell-view.c:1408
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
 
-#: shell/e-shortcuts.c:1003
-msgid "Contacts"
-msgstr "Contactos"
+#: shell/e-shell-view.c:1410
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1448
+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:1455
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution está en proceso de desconectarse."
+
+#: shell/e-shell-view.c:1461
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution está desconectado.  Pulse este botón para trabajar conectado."
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "No puedo configurar una carpeta local -- %s"
+
+#: shell/e-shell.c:1308
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Ooops!  La vista `%s' ha cesado inesperadamente. :-(\n"
+"Esto probablemente significa que el componente %s se ha roto."
 
 #: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
@@ -8922,16 +9424,16 @@ msgid "Create a new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
 #: shell/e-shortcuts-view.c:326
-msgid "_Remove This Group..."
-msgstr "_Quitar este grupo..."
+msgid "_Remove this Group..."
+msgstr "_Quitar este Grupo..."
 
 #: shell/e-shortcuts-view.c:327
 msgid "Remove this shortcut group"
 msgstr "Quitar este grupo de atajos"
 
 #: shell/e-shortcuts-view.c:329
-msgid "Re_name This Group..."
-msgstr "Re_nombrar Este Grupo..."
+msgid "Re_name this Group..."
+msgstr "Re_nombrar este Grupo..."
 
 #: shell/e-shortcuts-view.c:330
 msgid "Rename this shortcut group"
@@ -8962,24 +9464,37 @@ 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"
+msgstr "Abrir la carpeta asociada a este atajo en una nueva ventana"
 
 #: shell/e-shortcuts-view.c:473
-#, fuzzy
 msgid "Rename"
-msgstr "_Renombrar..."
+msgstr "Renombrar"
 
 #: shell/e-shortcuts-view.c:473
-#, fuzzy
 msgid "Rename this shortcut"
-msgstr "Quitar este grupo de atajos"
+msgstr "Renombrar este atajo"
 
 #: shell/e-shortcuts-view.c:475
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
+#: shell/e-shortcuts.c:614
+msgid "Error saving shortcuts."
+msgstr "Error guardando atajos."
+
+#: shell/e-shortcuts.c:1011
+msgid "Shortcuts"
+msgstr "Atajos"
+
+#: shell/e-shortcuts.c:1013
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-shortcuts.c:1016
+msgid "Contacts"
+msgstr "Contactos"
+
 #: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Sin nombre)"
@@ -9016,10 +9531,6 @@ msgstr "No se encontró la carpeta especificada"
 msgid "Function not implemented in this storage"
 msgstr "Función sin implementar en este manejador"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
 #: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Operación no soportada"
@@ -9031,12 +9542,27 @@ msgstr "El tipo especificado no esta soportado por este manejador"
 #: shell/e-task-widget.c:167
 #, c-format
 msgid "%s (...)"
-msgstr ""
+msgstr "%s (...)"
 
 #: shell/e-task-widget.c:172
-#, fuzzy, c-format
 msgid "%s (%d%% complete)"
-msgstr "(Completado "
+msgstr "%s (%d%% completado)"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active connections"
+msgstr "Conexiones activas"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr "Pulse OK para cerrar estas conexiones y estar fuera de linea"
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+msgstr "Servidor"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr "Las siguientes conexiones están actualmente activas:"
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
@@ -9050,10 +9576,6 @@ msgstr "Tipo de carpeta:"
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "La shell de Evolution."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Pulse \"Importar\" para comenzar a importar el archivo en Evolution. "
@@ -9085,7 +9607,6 @@ msgid "Don't import"
 msgstr "No importar"
 
 #: shell/main.c:89
-#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -9100,23 +9621,17 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"Hola. Gracias por tomarse la molestia de descargar esta LIBERACIÓN DE "
-"PRUEBA\n"
-"de la herramienta de trabajo en grupo Evolution.\n"
+"Hola. Gracias por tomarse la molestia de descargar esta liberación de prueba\n""de la herramienta de trabajo en grupo Evolution.\n"
 "\n"
-"Evolution todavía no está completa. Se está acercando,pero hay sitios\n"
-"donde faltan las utilidades o solo funcionan a medias. Si no puede "
-"averiguar\n"
-"como hacer algo, ¿probablemente es porque todavía no se puede hacer! :-)\n"
+"Evolution todavía no está completa. Se está acercando, pero hay sitios\n"
+"donde faltan las utilidades o solo funcionan a medias. \n"
 "\n"
-"Esperamos que pueda usar Evolution, pero todavía creemos que debemos\n"
-"advertirle que puede que: se rompa, pierda su correo, deje procesos\n"
-"corriendo, consuma el 100% de su CPU, envie comando incorrectos a sus\n"
-"servidores, y le ponga en situaciones embarazosas delante de sus \n"
-"amigos y compañeros de trabajo. Úselo como se indica.\n"
+"Si encuentra errores, por favor reportelos usando bugzilla.ximian.com.\n"
+"Este producto viene sin garantía y no está destinado a individuos con "
+"tendencia a sufrir violentos ataques de ira.\n"
 "\n"
 "Esperamos que le gusten los resultados de nuestro duro trabajo, y\n"
-"esperamos sus contribuciónes\n"
+"¡esperamos sus contribuciónes!\n"
 
 #: shell/main.c:110
 msgid ""
@@ -9127,9 +9642,8 @@ msgstr ""
 "El equipo de Evolution\n"
 
 #: shell/main.c:148
-#, fuzzy
 msgid "Cannot access the Evolution shell."
-msgstr "No puedo inicializar la shell de Evolution."
+msgstr "No puedo acceder a la shell de Evolution."
 
 #: shell/main.c:208
 msgid "Disable splash screen"
@@ -9404,9 +9918,8 @@ msgid "_Week"
 msgstr "_Semana"
 
 #: ui/evolution-comp-editor.xml.h:1
-#, fuzzy
 msgid "C_lose"
-msgstr "Cerrar"
+msgstr "_Cerrar"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this appointment"
@@ -9443,11 +9956,6 @@ msgstr "Imprimir este elemento"
 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"
@@ -9458,28 +9966,28 @@ 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"
+msgstr "Guardar este elemento a disco"
 
 #: 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"
+msgstr "_Acción"
 
 #: 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-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:8 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
+#: ui/evolution-comp-editor.xml.h:22 ui/evolution-signature-editor.xml.h:9
+#: ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "A_yuda"
 
@@ -9527,6 +10035,7 @@ msgstr "Enviar un _mensaje al contacto..."
 #: ui/evolution-contact-editor.xml.h:16
 #: ui/evolution-contact-list-editor.xml.h:14
 #: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -9933,9 +10442,8 @@ msgid "Mar_k As Read"
 msgstr "Mar_car como Leído"
 
 #: ui/evolution-mail-message.xml.h:40
-#, fuzzy
 msgid "Mark As I_mportant"
-msgstr "Marcar como _no leído"
+msgstr "Marcar como I_mportante"
 
 #: ui/evolution-mail-message.xml.h:41
 msgid "Mark As U_nread"
@@ -9946,9 +10454,8 @@ msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leidos"
 
 #: ui/evolution-mail-message.xml.h:43
-#, fuzzy
 msgid "Mark the selected messages as important"
-msgstr "Marcar los mensajes seleccionados para borrar"
+msgstr "Marcar los mensajes seleccionados como importantes"
 
 #: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as not having been read"
@@ -10111,7 +10618,8 @@ 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-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:42
 msgid "_Close"
 msgstr "_Cerrar"
@@ -10125,11 +10633,7 @@ msgstr "_Vista"
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Adjuntar un fichero"
-
-#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Cerrar el archivo actual"
 
@@ -10181,7 +10685,8 @@ 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:240
+#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 msgid "Save"
 msgstr "Guardar"
 
@@ -10190,85 +10695,86 @@ msgid "Save _Draft"
 msgstr "Guardar _Borrador"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Save in _folder... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:24
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the message in a specified folder"
 msgstr "Guardara el mensaje a una carpeta específica"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:26
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send _Later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the message later"
 msgstr "Enviar el mensaje más tarde"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send this message now"
 msgstr "Enviar este mensaje ahora"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:32
 msgid "Show / hide attachments"
 msgstr "Mostrar / ocultar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show _attachments"
 msgstr "Mostrar _adjuntos"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show attachments"
 msgstr "Mostrar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:35
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con tu clave PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Firmar este mensaje con su certificado de firma S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Activa si se muestra el campo CCO"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the CC field is displayed"
 msgstr "Activa si se muestra el campo CC"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Activa si se muestra el selector 'De'"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Activa si se muestra el campo Responder-A"
 
+#: ui/evolution-message-composer.xml.h:41
+msgid "_Attachment"
+msgstr "_Adjunto"
+
 #: ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
 msgstr "Campo Cc_o"
@@ -10278,6 +10784,7 @@ msgid "_Cc Field"
 msgstr "Campo _Cc"
 
 #: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Depurar"
 
@@ -10290,13 +10797,13 @@ msgid "_From Field"
 msgstr "Campo _De"
 
 #: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Insertar"
 
 #: ui/evolution-message-composer.xml.h:51
-#, fuzzy
 msgid "_Insert text file..."
-msgstr "Insertar un archivo de texto..."
+msgstr "_Insertar un archivo de texto..."
 
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
@@ -10351,45 +10858,40 @@ msgid "Re_fresh Task"
 msgstr "Re_leer Tarea"
 
 #: ui/evolution-tasks.xml.h:2
-#, fuzzy
 msgid "Copy selected task"
-msgstr "Copiar los mensajes _seleccionados"
+msgstr "Copiar las tareas seleccionadas"
 
 #: ui/evolution-tasks.xml.h:3
 msgid "Create a new task"
 msgstr "Crear una nueva tarea"
 
 #: ui/evolution-tasks.xml.h:4
-#, fuzzy
 msgid "Cut selected task"
-msgstr "Borrar las tareas seleccionadas"
+msgstr "Cortar las tareas seleccionadas"
 
 #: ui/evolution-tasks.xml.h:7
 msgid "New Task"
 msgstr "Nueva tarea"
 
 #: ui/evolution-tasks.xml.h:8
-#, fuzzy
 msgid "Paste task from the clipboard"
-msgstr "Pegar el contenido del porta papeles"
+msgstr "Pegar la tarea del portapapeles"
 
 #: ui/evolution-tasks.xml.h:10
 msgid "Save task as something else"
 msgstr "Guardar la tarea como otra cosa"
 
 #: ui/evolution-tasks.xml.h:11
-#, fuzzy
 msgid "Set task view preferences"
-msgstr "Alterar preferencias"
+msgstr "Configurar las preferencias de la vista de tareas"
 
 #: ui/evolution-tasks.xml.h:12
 msgid "Tasks Preferences..."
 msgstr "Preferencias de las tareas..."
 
 #: ui/evolution-tasks.xml.h:13
-#, fuzzy
 msgid "TasksPreferences"
-msgstr "Preferencias de las tareas..."
+msgstr "Preferencias de las tareas"
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
@@ -10568,7 +11070,6 @@ msgid "_Rename..."
 msgstr "_Renombrar..."
 
 #: ui/evolution.xml.h:59
-#, fuzzy
 msgid "_Shortcut"
 msgstr "Barra de atajo_s"
 
@@ -10585,14 +11086,12 @@ 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"
+msgstr "Cambiar las propiedades de Mi Evolution"
 
 #: ui/my-evolution.xml.h:4
-#, fuzzy
 msgid "_My Evolution Settings..."
-msgstr "_Configuración del correo..."
+msgstr "Configuración de _Mi Evolution..."
 
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -10606,26 +11105,6 @@ 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"
@@ -10646,6 +11125,13 @@ msgstr "Mensajes"
 msgid "With Category"
 msgstr "Con categoría"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Tentativa"
@@ -10722,13 +11208,6 @@ msgstr "Hora de _fin de la reunión:"
 msgid "All Attendees"
 msgstr "Todos los participantes"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Vista actual"
@@ -10762,84 +11241,76 @@ 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"
+msgstr "Baltico"
 
 #: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
-msgstr ""
+msgstr "Centroeuropeo"
 
 #: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
-msgstr ""
+msgstr "Chino"
 
 #: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
-msgstr ""
+msgstr "Cirílico"
 
 #: widgets/misc/e-charset-picker.c:63
-#, fuzzy
 msgid "Greek"
-msgstr "Semana"
+msgstr "Griego"
 
 #: widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
-msgstr ""
+msgstr "Japones"
 
 #: widgets/misc/e-charset-picker.c:65
 msgid "Korean"
-msgstr ""
+msgstr "Coreano"
 
 #: widgets/misc/e-charset-picker.c:66
-#, fuzzy
 msgid "Turkish"
-msgstr "Papelera"
+msgstr "Turco"
 
 #: widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
-msgstr ""
+msgstr "Unicode"
 
 #: widgets/misc/e-charset-picker.c:68
 msgid "Western European"
-msgstr ""
+msgstr "Europeo Occidental"
 
 #: widgets/misc/e-charset-picker.c:85
-#, fuzzy
 msgid "Traditional"
-msgstr "Fallo en la transacción"
+msgstr "Tradicional"
 
 #: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
 msgid "Simplified"
-msgstr ""
+msgstr "Simplificado"
 
 #: widgets/misc/e-charset-picker.c:91
 msgid "Ukrainian"
-msgstr ""
+msgstr "Ucraniano"
 
 #: widgets/misc/e-charset-picker.c:102
-#, fuzzy
 msgid "New"
-msgstr "_Nuevo"
+msgstr "Nuevo"
 
 #: widgets/misc/e-charset-picker.c:160
-#, fuzzy, c-format
 msgid "Unknown character set: %s"
-msgstr "Juego de caracteres por defecto: "
+msgstr "Juego de caracteres desconocido: %s"
 
 #: widgets/misc/e-charset-picker.c:202
-#, fuzzy
 msgid "Enter the character set to use"
-msgstr "Juego de caracteres por defecto: "
+msgstr "Introduzca el Juego de caracteres a usar"
 
 #: widgets/misc/e-charset-picker.c:277
-#, fuzzy
 msgid "Other..."
-msgstr "Otro"
+msgstr "Otro..."
 
 #: widgets/misc/e-charset-picker.c:394
 msgid "Character Encoding"
-msgstr ""
+msgstr "Codificación de Caracteres"
 
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
@@ -10910,785 +11381,3 @@ 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"
-
-#~ msgid "View All"
-#~ msgstr "Ver todo"
-
-#~ msgid "View all contacts"
-#~ msgstr "Ver todos los contactos"
-
-#~ msgid "Component successfully updated."
-#~ msgstr "Componente actualizado satisfactoriamente."
-
-#~ msgid "There was an error loading the calendar file."
-#~ msgstr "Hubo un error cargando al archivo del calendario."
-
-#~ msgid "I couldn't open your calendar file!\n"
-#~ msgstr "¡No pude abrir el archivo de su calendario!\n"
-
-#~ msgid "I couldn't load your calendar file!\n"
-#~ msgstr "¡No pude cargar el archivo de su calendario!\n"
-
-#~ msgid "This is a reply from someone who was uninvited!"
-#~ msgstr "¡Esta es una respuesta de alguien que no estaba invitado!"
-
-#~ msgid "I couldn't update your calendar store."
-#~ msgstr "No pude actualizar el alamacen de su calendario."
-
-#~ msgid "I couldn't delete the calendar component!\n"
-#~ msgstr "¡No pude borrar el componente del calendario!\n"
-
-#~ msgid "Component successfully deleted."
-#~ msgstr "Componente borrado satisfactoriamente."
-
-#~ msgid "I don't recognize this type of calendar component."
-#~ msgstr "No reconozco este tipo de componente de calendario."
-
-#~ msgid "Add to Calendar"
-#~ msgstr "Añadir al calendario"
-
-#~ msgid " Accept "
-#~ msgstr "Aceptar "
-
-#~ msgid " Decline "
-#~ msgstr "Declinar "
-
-#~ msgid " Tentative "
-#~ msgstr "Tentativa "
-
-#~ msgid "Update Calendar"
-#~ msgstr "Actualizar calendario"
-
-#~ msgid "Schedule Meeting"
-#~ msgstr "Concertar encuentro"
-
-#~ msgid "Attendee"
-#~ msgstr "Asistentes"
-
-#~ msgid "Attendee address"
-#~ msgstr "Dirección de los asistentes"
-
-#~ msgid "Attendees: "
-#~ msgstr "Asistentes: "
-
-#~ msgid ""
-#~ "Cancel\n"
-#~ "Meeting"
-#~ msgstr ""
-#~ "Cancelar\n"
-#~ "Encuentro"
-
-#~ msgid "Chair"
-#~ msgstr "Silla"
-
-#~ msgid "Non-Participant"
-#~ msgstr "No participa"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Participación opcional"
-
-#~ msgid "Organizer: "
-#~ msgstr "Organizador: "
-
-#~ msgid ""
-#~ "Publish\n"
-#~ "Event"
-#~ msgstr ""
-#~ "Publicar\n"
-#~ "Evento"
-
-#~ msgid "RSVP"
-#~ msgstr "RSVP"
-
-#~ msgid ""
-#~ "Request\n"
-#~ "Meeting"
-#~ msgstr ""
-#~ "Concertar\n"
-#~ "Encuentro"
-
-#~ msgid "Required Participant"
-#~ msgstr "Participantes requeridos"
-
-#~ msgid "Role"
-#~ msgstr "Papel"
-
-#~ msgid ""
-#~ "Schedule\n"
-#~ "Time"
-#~ msgstr ""
-#~ "Concertar\n"
-#~ "Hora"
-
-#~ msgid "_Reply to _List"
-#~ msgstr "Resp. a la _Lista"
-
-#~ msgid "About this application"
-#~ msgstr "Acerca de esta aplicación"
-
-#~ msgid "About..."
-#~ msgstr "Acerca de..."
-
-#~ msgid "Actio_ns"
-#~ msgstr "Accio_nes"
-
-#~ msgid "Address _Book... (FIXME)"
-#~ msgstr "_Agenda de Direcciones...(FIXME)"
-
-#~ msgid "Assig_n Task (FIXME)"
-#~ msgstr "Assig_n Task (FIXME)"
-
-#~ msgid "C_lear"
-#~ msgstr "_Limpiar"
-
-#~ msgid "Chec_k Names (FIXME)"
-#~ msgstr "Chec_k Names (FIXME)"
-
-#~ msgid "Clear the selection"
-#~ msgstr "Quitar la seleccionada"
-
-#~ msgid "Cop_y to Folder... (FIXME)"
-#~ msgstr "Cop_y to Folder... (FIXME)"
-
-#~ msgid "Dump XML"
-#~ msgstr "Volcar XML"
-
-#~ msgid "Dump the UI Xml description"
-#~ msgstr "Volcar la descripción XML de la IU"
-
-#~ msgid "Fi_rst Item in Folder (FIXME)"
-#~ msgstr "Fi_rst Item in Folder (FIXME)"
-
-#~ msgid "Find"
-#~ msgstr "Buscar"
-
-#~ msgid "For_ward (FIXME)"
-#~ msgstr "For_ward (FIXME)"
-
-#~ msgid "Go to the next item"
-#~ msgstr "Ir al siguiente elemento"
-
-#~ msgid "Go to the previous item"
-#~ msgstr "Ir al elemento anterior"
-
-#~ msgid "In_complete Task (FIXME)"
-#~ msgstr "In_complete Task (FIXME)"
-
-#~ msgid "Meeting Re_quest (FIXME)"
-#~ msgstr "Meeting Re_quest (FIXME)"
-
-#~ msgid "Modify the file's properties"
-#~ msgstr "Propiedades las propiedades del archivo"
-
-#~ msgid "N_ext"
-#~ msgstr "Sigui_ente"
-
-#~ msgid "Pre_vious"
-#~ msgstr "Pre_vio"
-
-#~ msgid "Print S_etup..."
-#~ msgstr "Configurar impr_esión..."
-
-#~ msgid "Redo"
-#~ msgstr "Rehacer"
-
-#~ msgid "Redo the undone action"
-#~ msgstr "Rehacer la acción deshecha"
-
-#~ msgid "Replace"
-#~ msgstr "Remplazar"
-
-#~ msgid "Replace a string"
-#~ msgstr "Remplazar una cadena"
-
-#~ msgid "Reply to A_ll (FIXME)"
-#~ msgstr "Reply to A_ll (FIXME)"
-
-#~ msgid "S_end Status Report (FIXME)"
-#~ msgstr "S_end Status Report (FIXME)"
-
-#~ msgid "S_kip Occurrence (FIXME)"
-#~ msgstr "S_kip Occurrence (FIXME)"
-
-#~ msgid "Search again for the same string"
-#~ msgstr "Buscar de nuevo la misma cadena"
-
-#~ msgid "Search for a string"
-#~ msgstr "Buscar una cadena"
-
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "Task _Request (FIXME)"
-
-#~ msgid "Undo"
-#~ msgstr "Deshacer"
-
-#~ msgid "Undo the last action"
-#~ msgstr "Deshacer la última acción"
-
-#~ msgid "_About..."
-#~ msgstr "_Acerca de..."
-
-#~ msgid "_Item (FIXME)"
-#~ msgstr "_Item (FIXME)"
-
-#~ msgid "_Journal Entry (FIXME)"
-#~ msgstr "_Journal Entry (FIXME)"
-
-#~ msgid "_Last Item in Folder (FIXME)"
-#~ msgstr "_Last Item in Folder (FIXME)"
-
-#~ msgid "_Mail Message (FIXME)"
-#~ msgstr "_Mail Message (FIXME)"
-
-#~ msgid "_Mark Complete (FIXME)"
-#~ msgstr "_Mark Complete (FIXME)"
-
-#~ msgid "_Move to Folder... (FIXME)"
-#~ msgstr "_Move to Folder... (FIXME)"
-
-#~ msgid "_Note (FIXME)"
-#~ msgstr "_Note (FIXME)"
-
-#~ msgid "_Reply (FIXME)"
-#~ msgstr "_Reply (FIXME)"
-
-#~ msgid "_Unread Item (FIXME)"
-#~ msgstr "_Unread Item (FIXME)"
-
-#~ msgid "Schedule some sort of a meeting"
-#~ msgstr "Programas algún tipo de encuentro"
-
-#~ msgid "Could not test lock file for %s: %s"
-#~ msgstr "No puedo probar el fichero de lock para %s: %s"
-
-#~ msgid "%A, %e %B %Y"
-#~ msgstr "%A, %e %B %Y"
-
-#~ msgid "<b>Error loading calendar:<br>Method not supported"
-#~ msgstr "<b>Error cargando el calendario:<br>Método no soportado"
-
-#~ msgid ""
-#~ "Cannot open the HTML file:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No pude abrir el archivo HTML:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Error reading data:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Error leyendo los datos\n"
-#~ "%s"
-
-#~ msgid "File does not have a place for the services.\n"
-#~ msgstr "El archivo no tiene un lugar para el servicio.\n"
-
-#~ msgid "Select a service"
-#~ msgstr "Seleccione un servicio"
-
-#~ msgid ""
-#~ "You can select a different HTML page for the background of the Executive "
-#~ "Summary.\n"
-#~ "\n"
-#~ "Just leave it blank for the default"
-#~ msgstr ""
-#~ "Puede elegir una página HTML distinta como fondo del Resumen de Trabajo.\n"
-#~ "\n"
-#~ "Déjelo vacío para la elección por defecto"
-
-#~ msgid "Open %s with the default GNOME application"
-#~ msgstr "Abrir %s con la aplicación por defecto de GNOME"
-
-#~ msgid "Open %s with the default GNOME web browser"
-#~ msgstr "Abrir %s con el navegador web por defecto de GNOME"
-
-#~ msgid "Send an email to %s"
-#~ msgstr "Enviar un correo a %s"
-
-#~ msgid "Run %s"
-#~ msgstr "Ejecutar %s"
-
-#~ msgid "Close %s"
-#~ msgstr "Cerrar %s"
-
-#~ msgid "Move %s to the left"
-#~ msgstr "Mover %s a la izquierda"
-
-#~ msgid "Move %s to the right"
-#~ msgstr "Mover %s a la derecha"
-
-#~ msgid "Move %s into the previous row"
-#~ msgstr "Mover %s a la fila anterior"
-
-#~ msgid "Move %s into the next row"
-#~ msgstr "Mover %s a la fila siguiente"
-
-#~ msgid "Configure %s"
-#~ msgstr "Configurar %s"
-
-#~ msgid "page"
-#~ msgstr "pagina"
-
-#~ msgid "Appearance"
-#~ msgstr "Apariencia"
-
-#~ msgid "Background:"
-#~ msgstr "Fondo:"
-
-#~ msgid ""
-#~ "Executive summary component could not initialize Bonobo.\n"
-#~ "If there was a warning message about the RootPOA, it probably means\n"
-#~ "you compiled Bonobo against GOAD instead of OAF."
-#~ msgstr ""
-#~ "El componente Resumen de Trabajo no pudo inicializar Bonobo.\n"
-#~ "Si hubo un mensaje de advertencia sobre el RootPOA, probablemente "
-#~ "significa\n"
-#~ "que compiló Bonobo con GOAD en lugar de con OAF."
-
-#~ msgid "Factory for the RDF summary."
-#~ msgstr "Factoría para el resumen RDF."
-
-#~ msgid "RDF Summary"
-#~ msgstr "Resumen RDF"
-
-#~ msgid "Factory for the test bonobo component."
-#~ msgstr "Factoría para el componente bonobo de prueba."
-
-#~ msgid "Factory for the test component."
-#~ msgstr "Factoría para el componente de prueba."
-
-#~ msgid "Test bonobo service"
-#~ msgstr "Servicio de prueba bonobo"
-
-#~ msgid "Test service"
-#~ msgstr "Probar Servicio"
-
-#~ msgid "Update automatically"
-#~ msgstr "Actualizado automático"
-
-#~ msgid "Update every "
-#~ msgstr "Actualizar cada "
-
-#~ msgid "Incomplete message written on pipe!"
-#~ msgstr "¡Mensaje escrito incompleto en la tubería!"
-
-#~ msgid "Inline attachment"
-#~ msgstr "Adjunto en línea"
-
-#~ msgid "Send as:"
-#~ msgstr "Enviar como:"
-
-#~ msgid "%I:%M:%S %p%n"
-#~ msgstr "%I:%M:%S %p%n"
-
-#~ msgid "%H:%M:%S%n"
-#~ msgstr "%H:%M:%S%n"
-
-#~ msgid "%I:%M %p%n"
-#~ msgstr "%I:%M %p%n"
-
-#~ msgid "%H:%M%n"
-#~ msgstr "%H:%M%n"
-
-#~ msgid "Error adding card"
-#~ msgstr "Error añadiendo tarjeta"
-
-#~ msgid "Success"
-#~ msgstr "Exito"
-
-#~ msgid "Repository offline"
-#~ msgstr "Repositorio desconectado"
-
-#~ msgid "Card not found"
-#~ msgstr "Tarjeta no encontrada"
-
-#~ msgid "Protocol not supported"
-#~ msgstr "Protocolo no soportado"
-
-#~ msgid "Canceled"
-#~ msgstr "Cancelado"
-
-#~ msgid "Other error"
-#~ msgstr "Otro error"
-
-#~ msgid "Add Service"
-#~ msgstr "Añadir Servicio"
-
-#~ msgid "Add a new service to the Executive Summary"
-#~ msgstr "Añadir un nuevo servicio al Resumen de Trabajo"
-
-#~ msgid "Create a new email"
-#~ msgstr "Crear un nuevo mensaje electrónico"
-
-#~ msgid "Executive Summary Settings..."
-#~ msgstr "Configuración del Resumen de Trabajo..."
-
-#~ msgid "New Mail"
-#~ msgstr "Nuevo"
-
-#~ msgid "Edit Task"
-#~ msgstr "Editar Tarea"
-
-#~ msgid "Appointment - %s"
-#~ msgstr "Cita - %s"
-
-#~ msgid "Task - %s"
-#~ msgstr "Tarea - %s"
-
-#~ msgid "Journal entry - %s"
-#~ msgstr "Entrada del diario - %s"
-
-#~ msgid "No summary"
-#~ msgstr "Sin resumen"
-
-#~ msgid "Edit Appointment"
-#~ msgstr "Editar Cita"
-
-#~ msgid "Appointment Basics"
-#~ msgstr "Bases de la citas"
-
-#~ msgid "_Starting date:"
-#~ msgstr "Fecha de Ini_cio:"
-
-#~ msgid "Error hashing password."
-#~ msgstr "Error calculando el hash de la contraseña."
-
-#~ msgid "Invalid password."
-#~ msgstr "Contraseña erronea."
-
-#~ msgid "Could not sign: failed to create content info."
-#~ msgstr "No pude firmar: error al crear la información del contenido."
-
-#~ msgid "Could not sign: failed to create signing context."
-#~ msgstr "No pude firmar: error al crear el contexto a firmar."
-
-#~ msgid "Could not sign: failed to create signature."
-#~ msgstr "No pude firmar: error al crear la firma."
-
-#~ msgid "'clearsign' is not supported by S/MIME."
-#~ msgstr "'firma en claro' no está soportado por S/MIME."
-
-#~ msgid "Could not encrypt: failed to create enveloped data."
-#~ msgstr "No pude encriptar: error al crear la información del sobre."
-
-#~ msgid "Could not encrypt: failed to create encryption context."
-#~ msgstr "No pude encriptar: error al crear el contexto de encriptación."
-
-#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
-#~ msgstr "No pude encriptar: clave de usuario invalida: \"%s\"."
-
-#~ msgid "Could not encrypt: encoding failed."
-#~ msgstr "No pude encriptar: error en la codificación."
-
-#~ msgid "Failed to decrypt: Unknown"
-#~ msgstr "Fallo al desencriptar: Desconocido"
-
-#~ msgid ""
-#~ "This version of Evolution was not built with support for S/MIME.\n"
-#~ "You may wish to instead use PGP to %s your document."
-#~ msgstr ""
-#~ "Esta versión de Evolution no fue construida con soporte para S/MIME.\n"
-#~ "En su lugar puede querer usar PGP para %s su documento."
-
-#~ msgid "sign and encrypt"
-#~ msgstr "firmar y encriptar"
-
-#~ msgid "sign"
-#~ msgstr "firmar"
-
-#~ msgid "encrypt"
-#~ msgstr "encriptar"
-
-#~ msgid "PGP"
-#~ msgstr "PGP"
-
-#~ msgid "Could not create a S/MIME verification context."
-#~ msgstr "No pude crear un contexto de verificación S/MIME."
-
-#~ msgid "As _Minicards"
-#~ msgstr "Como _mini tarjetas"
-
-#~ msgid "As _Table"
-#~ msgstr "Como _Tabla"
-
-#~ msgid "Mark Complete"
-#~ msgstr "Marcar como completa"
-
-#~ msgid "Edit the task"
-#~ msgstr "Editar la tarea"
-
-#~ msgid "Remove the selected folder"
-#~ msgstr "Borrar la carpeta seleccionada"
-
-#~ msgid "_Remove"
-#~ msgstr "_Quitar"
-
-#~ msgid ""
-#~ "We were unable to open this addressbook.  This either\n"
-#~ "means you have entered an incorrect URI, or have tried\n"
-#~ "to access an LDAP server and don't have LDAP support\n"
-#~ "compiled in.  If you've entered a URI, check the URI for\n"
-#~ "correctness and reenter.  If not, you probably have\n"
-#~ "attempted to access an LDAP server.  If you wish to be\n"
-#~ "able to use LDAP, you'll need to download and install\n"
-#~ "OpenLDAP and recompile and install Evolution.\n"
-#~ msgstr ""
-#~ "No podemos abrir esta agenda de direcciones. Esto puede\n"
-#~ "significar que, o bien ha introducido un URI incorrecto,\n"
-#~ "o que ha intentado acceder a un servidor LDAP y no ha\n"
-#~ "compilado el soporte para LDAP. Si ha introducido un URI,\n"
-#~ "compruébelo y reinténtelo. De no ser así, posiblemente a\n"
-#~ "intentado acceder a un servidor LDAP. Si desea poder emplear\n"
-#~ "LDAP, necesitará descargar e instalar OpenLDAP y recompilar\n"
-#~ "e instalar evolution.\n"
-
-#~ msgid "SASL"
-#~ msgstr "SASL"
-
-#~ msgid "Apply any new filters to the mail in this box"
-#~ msgstr "Aplicar cualquier filtro nuevo al correo en este buzón"
-
-#~ msgid "Compose a new message"
-#~ msgstr "Escribir un nuevo mensaje"
-
-#~ msgid "Configure Folder..."
-#~ msgstr "Configurar la carpeta..."
-
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Copiar mensaje a una nueva carpeta"
-
-#~ msgid "Display all of the message headers"
-#~ msgstr "Mostrar la cabecera de los mensajes"
-
-#~ msgid "Edit the current message"
-#~ msgstr "Editar el mensaje actual"
-
-#~ msgid "Expunge"
-#~ msgstr "Comprimir"
-
-#~ msgid "Finaly remove all mails tagged for deletion"
-#~ msgstr "Eliminar todos los mensajes marcados para borrar"
-
-#~ msgid "Forward inline"
-#~ msgstr "Reenviar dentro del mensaje"
-
-#~ msgid "Forward this message in-line with your mail, so you can edit it"
-#~ msgstr ""
-#~ "Reenviar este mensaje incluido en su correo, para que pueda editarlo"
-
-#~ msgid "Hide Deleted Messages"
-#~ msgstr "Ocultar Mensajes Borrados"
-
-#~ msgid "Invert Selection"
-#~ msgstr "Invertir selección"
-
-#~ msgid "Move message to a new folder"
-#~ msgstr "Mover mensaje a una nueva carpeta"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Imprimir vista previa del mensaje..."
-
-#~ msgid "Reply to all"
-#~ msgstr "Resp. todos"
-
-#~ msgid "Reply to sender"
-#~ msgstr "Resp. remitente"
-
-#~ msgid "S_ource"
-#~ msgstr "F_uente"
-
-#~ msgid "Send a reply to the person who sent you this mail"
-#~ msgstr "Enviar una respuesta a la presona que le envio este mensaje"
-
-#~ msgid "Send a single mail in reply to all the selected mail"
-#~ msgstr "Enviar un solo mensaje para responder a todo el correo seleccionado"
-
-#~ msgid ""
-#~ "Send queued mail\n"
-#~ "    and retrieve new mail"
-#~ msgstr ""
-#~ "Enviar el correo en la cola\n"
-#~ "    y obtener el nuevo"
-
-#~ msgid "Undelete"
-#~ msgstr "Recuperar"
-
-#~ msgid "View Raw Message Source"
-#~ msgstr "Ver las fuentes del mensaje"
-
-#~ msgid "_Attachment"
-#~ msgstr "_Adjunto"
-
-#~ msgid "_Open Selected Items"
-#~ msgstr "Abrir element_os seleccionados"
-
-#~ msgid "_Reply"
-#~ msgstr "_Responder"
-
-#~ msgid "_Save Message As..."
-#~ msgstr "Guardar men_saje como..."
-
-#~ msgid "_Threaded"
-#~ msgstr "_Encadenados"
-
-#~ msgid "Send the message now"
-#~ msgstr "Enviar el mensaje ahora"
-
-#~ msgid "Advanced ..."
-#~ msgstr "Avanzada..."
-
-#~ msgid "Save As ..."
-#~ msgstr "Guardar como ..."
-
-#~ msgid "%s is not a selectable folder"
-#~ msgstr "%s no es una carpeta seleccionable"
-
-#~ msgid "VFolder on Subject"
-#~ msgstr "VFolder según el asunto"
-
-#~ msgid "VFolder on Sender"
-#~ msgstr "VFolder según el remitente"
-
-#~ msgid "VFolder on Recipients"
-#~ msgstr "VFolder según los destinatarios"
-
-#~ msgid "Mark as Read"
-#~ msgstr "Marcar como leído"
-
-#~ msgid "Mark as Unread"
-#~ msgstr "Marcar como no leído"
-
-#~ msgid "Move to Folder..."
-#~ msgstr "Mover a la carpeta..."
-
-#~ msgid "Copy to Folder..."
-#~ msgstr "Copiar a la carpeta..."
-
-#~ msgid "Do you accept?"
-#~ msgstr "¿Acepta?"