Updated Spanish translation.

svn path=/trunk/; revision=11924
author: Hector Garcia <hectorg@src.gnome.org> 2001-08-12 07:42:01 +0800
committer: Hector Garcia <hectorg@src.gnome.org> 2001-08-12 07:42:01 +0800
commit: d49b1127126e01b8cc50150b92a518db750eceec (patch)
tree: bd31bb2fdcd498b3bb00409f65fc99ba820ce014 /po
parent: 0fd45526f9ade69b1209378015c3cd8e9848de49 (diff)
download: gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar
gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar.gz
gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar.bz2
gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar.lz
gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar.xz
gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar.zst
gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.zip
2 files changed, 1856 insertions, 1600 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index b191e2e44e..f7c3e48e37 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-12  Héctor García Álvarez <hector@scouts-es.org>
+
+        * es.po: Updated Spanish translation.
+	
 2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* POTFILES.in: Added more missing files.
diff --git a/po/es.po b/po/es.po
index 6f087898bc..385da33848 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-08-04 14:12+0200\n"
+"POT-Creation-Date: 2001-08-12 01:33+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"
@@ -22,11 +22,11 @@ msgstr "Factoría para importar archivos VCard a Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importa archivos VCard a Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3624
 msgid "Card: "
 msgstr "Tarjeta: "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Name: "
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 "Nombre:"
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "  Prefix:     "
@@ -42,7 +42,7 @@ msgstr ""
 "\n"
 "  Prefijo:    "
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3628
 msgid ""
 "\n"
 "  Given:      "
@@ -50,7 +50,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3606
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Additional: "
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Family:     "
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Suffix:     "
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "  Sufijo:     "
 
-#: addressbook/backend/ebook/e-card.c:3622
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "Birth Date: "
@@ -82,7 +82,7 @@ msgstr ""
 "\n"
 "Fecha de nacimiento: "
 
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3656
 msgid ""
 "\n"
 "Address:"
@@ -90,7 +90,7 @@ msgstr ""
 "\n"
 "Dirección:"
 
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -98,7 +98,7 @@ msgstr ""
 "\n"
 "  Dirección postal: "
 
-#: addressbook/backend/ebook/e-card.c:3636
+#: addressbook/backend/ebook/e-card.c:3659
 msgid ""
 "\n"
 "  Ext:         "
@@ -106,7 +106,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "  Street:      "
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 "  Calle:       "
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3661
 msgid ""
 "\n"
 "  City:        "
@@ -122,7 +122,7 @@ msgstr ""
 "\n"
 "  Ciudad:      "
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3662
 msgid ""
 "\n"
 "  Region:      "
@@ -130,7 +130,7 @@ msgstr ""
 "\n"
 "  Región:      "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "  Postal Code: "
@@ -138,7 +138,7 @@ msgstr ""
 "\n"
 "  Código postal: "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3664
 msgid ""
 "\n"
 "  Country:     "
@@ -146,7 +146,7 @@ msgstr ""
 "\n"
 "  País:        "
 
-#: addressbook/backend/ebook/e-card.c:3654
+#: addressbook/backend/ebook/e-card.c:3677
 msgid ""
 "\n"
 "Delivery Label: "
@@ -154,7 +154,7 @@ msgstr ""
 "\n"
 "Etiqueta de envío: "
 
-#: addressbook/backend/ebook/e-card.c:3666
+#: addressbook/backend/ebook/e-card.c:3689
 msgid ""
 "\n"
 "Telephones:\n"
@@ -162,7 +162,7 @@ msgstr ""
 "\n"
 "Teléfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3669
+#: addressbook/backend/ebook/e-card.c:3692
 msgid ""
 "\n"
 "Telephone:"
@@ -170,7 +170,7 @@ msgstr ""
 "\n"
 "Teléfono:"
 
-#: addressbook/backend/ebook/e-card.c:3693
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "E-mail:\n"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "Correo electrónico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "E-mail:"
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "Correo electrónico:"
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3738
 msgid ""
 "\n"
 "Mailer: "
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "Programa de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3721
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Time Zone: "
@@ -202,7 +202,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3729
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "Geo Location: "
@@ -210,7 +210,7 @@ msgstr ""
 "\n"
 "Localización geográfica: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3756
 msgid ""
 "\n"
 "Business Role: "
@@ -218,7 +218,7 @@ msgstr ""
 "\n"
 "Cargo: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3768
 msgid ""
 "\n"
 "Org: "
@@ -226,7 +226,7 @@ msgstr ""
 "\n"
 "Organización: "
 
-#: addressbook/backend/ebook/e-card.c:3746
+#: addressbook/backend/ebook/e-card.c:3769
 msgid ""
 "\n"
 "  Name:  "
@@ -234,7 +234,7 @@ msgstr ""
 "\n"
 "  Nombre: "
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3770
 msgid ""
 "\n"
 "  Unit:  "
@@ -242,7 +242,7 @@ msgstr ""
 "\n"
 "  Unidad: "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3771
 msgid ""
 "\n"
 "  Unit2: "
@@ -250,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidad2: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "  Unit3: "
@@ -258,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidad3: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3773
 msgid ""
 "\n"
 "  Unit4: "
@@ -266,7 +266,7 @@ msgstr ""
 "\n"
 "  Unidad4: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Categories: "
@@ -274,7 +274,7 @@ msgstr ""
 "\n"
 "categorías: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3778
 msgid ""
 "\n"
 "Comment: "
@@ -292,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3768
+#: addressbook/backend/ebook/e-card.c:3791
 msgid ""
 "\n"
 "Unique String: "
@@ -300,7 +300,7 @@ msgstr ""
 "\n"
 "Cadena única: "
 
-#: addressbook/backend/ebook/e-card.c:3771
+#: addressbook/backend/ebook/e-card.c:3794
 msgid ""
 "\n"
 "Public Key: "
@@ -308,11 +308,11 @@ msgstr ""
 "\n"
 "Llave pública: "
 
-#: addressbook/backend/ebook/e-card.c:4043
+#: addressbook/backend/ebook/e-card.c:4066
 msgid "Multiple VCards"
 msgstr "VCards Múltiples"
 
-#: addressbook/backend/ebook/e-card.c:4051
+#: addressbook/backend/ebook/e-card.c:4074
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -398,195 +398,160 @@ msgstr "Factoría para el componente de agenda de Evolution."
 msgid "Factory for the sample Addressbook control"
 msgstr "Factoría para el control de ejemplo de la Agenda"
 
-#: addressbook/gui/component/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:144
+msgid "Edit Addressbook"
+msgstr "Editar agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tipo de agenda de direcciones desconocido"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Ninguno (modo anónimo)"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Account Name"
+msgstr "Nombre de la cuenta"
 
-#: 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:69
-msgid "Password"
-msgstr "Clave"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
+msgstr "Añadir agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Tipo de autentificación desconocido"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Advanced"
+msgstr "Avanzado"
 
-#: addressbook/gui/component/addressbook-config.c:177
+#: addressbook/gui/component/addressbook-config.glade.h:5
 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"
-
-#. Remember the password?
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:81 mail/mail-mt.c:439
-msgid "Remember this password"
-msgstr "Recuerda esta contraseña"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:45
-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.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:151
+msgid "Basic"
+msgstr "Básico"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Rango de búsqueda:"
+#: addressbook/gui/component/addressbook-config.glade.h:7
+msgid "De_lete"
+msgstr "Bo_rrar"
 
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Autentificación:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+msgid "One"
+msgstr "Uno"
 
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Opciones avanzadas de LDAP"
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "Search _base:"
+msgstr "Base de _búsqueda:"
 
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:70
-msgid "Path:"
-msgstr "Ruta:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Search s_cope: "
+msgstr "Rango de bú_squeda: "
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Path Help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:11
+msgid "Server Name"
+msgstr "Nombre del servidor"
 
-#: 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.glade.h:12
+msgid "Sub"
+msgstr "Sub"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "Editar agenda de direcciones"
+#: addressbook/gui/component/addressbook-config.glade.h:13
+msgid "The information below is required in order to add an addressbook.  "
+msgstr "Se requiere la información de debajo para añadir una agenda.  "
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "Añadir agenda de direcciones"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "This information is not required for most ldap servers. "
+msgstr ""
+"Esta información no es requerida por la mayoría de los servidores ldap."
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:15
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 msgstr ""
-"Seleccione el tipo de agenda de direcciones que tiene, e introduzca la "
-"información relevante acerca de ella."
+"Esta información la usa su servidor ldap para especificar que nodos son "
+"usados en una búsqueda. Para más información contacte con el administrador "
+"del servidor."
 
-#: addressbook/gui/component/addressbook-config.c:691
-#: mail/mail-config.glade.h:59 my-evolution/e-summary-preferences.c:881
-msgid "Name:"
-msgstr "Nombre:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Name help text here"
-msgstr "FIXME Name help text here"
-
-#: addressbook/gui/component/addressbook-config.c:694
-#: 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:695
-msgid "FIXME Description help text here"
-msgstr "FIXME Description help text here"
+#: addressbook/gui/component/addressbook-config.glade.h:16
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
+"Este es el nodo base de todas sus búsquedas en el servidor ldap. Para más "
+"información contacte con el administrador del servidor."
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "Fuentes de la agenda de direcciones"
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid "This is the name of the server where your addressbook is located."
+msgstr "Este es el nombre sel servidor donde está su agenda."
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "De_lete"
-msgstr "Bo_rrar"
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "This is the port that your ldap server uses."
+msgstr "Este es el puerto que usa su servidor ldap."
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Name"
-msgstr "Nombre"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
+"Este nombre será usado para identificar su cuenta, Es solo para poder "
+"mostrarlo en pantalla."
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "URI"
-msgstr "URI"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid "_Account name:"
+msgstr "Nombre de la cuent_a:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/mail-config.glade.h:109
+#: calendar/gui/dialogs/alarm-page.glade.h:9 mail/mail-config.glade.h:88
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Add"
 msgstr "_Añadir"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:111 ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:50
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: mail/mail-config.glade.h:93 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:23
+msgid "_My server requires authentication"
+msgstr "_Mi servidor requiere autenticación"
+
+#: addressbook/gui/component/addressbook-config.glade.h:24
+msgid "_Port:"
+msgstr "_Puerto:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+msgid "_Server name:"
+msgstr "Nombre del _servidor:"
+
+#: addressbook/gui/component/addressbook-storage.c:135
 msgid "Other Contacts"
 msgstr "Otros contactos"
 
-#: addressbook/gui/component/addressbook.c:385
+#: addressbook/gui/component/addressbook.c:372
 #, c-format
-msgid "Enter password for %s"
-msgstr "Introduzca la contraseña para %s"
+msgid "Please enter your email address and password for access to %s"
+msgstr ""
+"Por favor introduzca su dirección correo y su contraseña para acceder a %s"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid "LDAP Authentication"
+msgstr "Autenticación LDAP"
 
-#: addressbook/gui/component/addressbook.c:413
+#: addressbook/gui/component/addressbook.c:391
+msgid "Email Address:"
+msgstr "Dirección de correo:"
+
+#: addressbook/gui/component/addressbook.c:404
+msgid "Password:"
+msgstr "Clave:"
+
+#: addressbook/gui/component/addressbook.c:467
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook.c:420
+#: addressbook/gui/component/addressbook.c:474
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -596,7 +561,7 @@ msgstr ""
 "que ha introducido una URI erronea, o que el servidor LDAP está\n"
 "caido"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:479
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -608,7 +573,7 @@ msgstr ""
 "de las fuentes del CVS una vez que haya obtenido LDAP del\n"
 "siguiente enlace.\n"
 
-#: addressbook/gui/component/addressbook.c:433
+#: addressbook/gui/component/addressbook.c:487
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -616,24 +581,30 @@ 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:594
+#: addressbook/gui/component/addressbook.c:638
 #: calendar/gui/cal-search-bar.c:54
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:595
+#: addressbook/gui/component/addressbook.c:639
 msgid "Name contains"
 msgstr "El nombre contiene"
 
-#: addressbook/gui/component/addressbook.c:596
+#: addressbook/gui/component/addressbook.c:640
 msgid "Email contains"
 msgstr "El mensaje contiene"
 
-#: addressbook/gui/component/addressbook.c:597
-msgid "Category contains"
-msgstr "La categría contiene"
+#: addressbook/gui/component/addressbook.c:641
+msgid "Category is"
+msgstr "Categoría es"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:642 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:751
+#: addressbook/gui/component/addressbook.c:834
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrará el visor de carpetas"
 
@@ -648,19 +619,19 @@ msgstr "(nada)"
 
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1549
+#: addressbook/gui/contact-editor/e-contact-editor.c:1581
 msgid "Primary Email"
 msgstr "Correo electrónico principal"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1550
-#: addressbook/gui/widgets/e-addressbook-view.c:797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1582
+#: addressbook/gui/widgets/e-addressbook-view.c:801
 msgid "Email 2"
 msgstr "Correo electrónico 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1551
-#: addressbook/gui/widgets/e-addressbook-view.c:798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1583
+#: addressbook/gui/widgets/e-addressbook-view.c:802
 msgid "Email 3"
 msgstr "Correo electrónico 3"
 
@@ -715,13 +686,10 @@ 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:633
+#: addressbook/gui/component/select-names/e-select-names.c:640
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:550 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1168
-#: my-evolution/e-summary-preferences.c:1218
-#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:267
-#: shell/e-shortcuts-view.c:477
+#: filter/filter-rule.c:543 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:176 shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "Quitar"
 
@@ -742,26 +710,41 @@ msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 "No fue posible obtener el almacen local.  Esto no debería ocurrir nunca."
 
+#: addressbook/gui/component/select-names/e-select-names.c:484
+msgid "Select Contacts from Addressbook"
+msgstr "Seleccionas contactos de la agenda"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Lista de destinatarios"
+msgid "C_ontaining:"
+msgstr "C_onteniendo:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "_Seleccionar nombres"
+msgid "Co_ntacts:"
+msgstr "Co_ntactos:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
-msgstr "Seleccionar nombre de la _carpeta:"
+msgid "F_ind"
+msgstr "Bus_car"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "_Seleccionar nombres"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr "Mostrar contactos que concuerden con el siguiente criterio:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 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/component/select-names/select-names.glade.h:7
+msgid "_Folder:"
+msgstr "_Carpeta:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "_Message Recipients:"
+msgstr "Destinatarios del _mensaje:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -776,8 +759,8 @@ msgid "Business _Fax"
 msgstr "_Fax del trabajo"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
-#: calendar/gui/dialogs/event-page.glade.h:2
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
@@ -786,7 +769,7 @@ msgid "Contact Editor"
 msgstr "Editor de contactos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "Detalles"
 
@@ -795,7 +778,7 @@ msgid "File As:"
 msgstr "Archivar como:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "General"
 msgstr "General"
 
@@ -840,17 +823,16 @@ msgid "_Business"
 msgstr "_Trabajo"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contactos..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1447
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1313
-#: mail/mail-config.glade.h:110 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:1472 mail/folder-browser.c:1313
+#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:39
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -902,113 +884,112 @@ msgstr "Es_tá es la dirección de correo"
 msgid "Delete Contact?"
 msgstr "¿Borrar contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:725
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto está en estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1539
+#: addressbook/gui/widgets/e-addressbook-view.c:809
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
-#: e-util/e-categories-config.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1540
+#: addressbook/gui/contact-editor/e-contact-editor.c:1607
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1541
 msgid "Business 2"
 msgstr "Trabajo 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1542
+#: addressbook/gui/widgets/e-addressbook-view.c:789
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/contact-editor/e-contact-editor.c:1543
 msgid "Callback"
 msgstr "Rellamada"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1544
 msgid "Car"
 msgstr "Coche"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1513
+#: addressbook/gui/contact-editor/e-contact-editor.c:1545
 msgid "Company"
 msgstr "Compañía"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1514
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
+#: addressbook/gui/contact-editor/e-contact-editor.c:1546
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1515
+#: addressbook/gui/contact-editor/e-contact-editor.c:1547
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1516
-#: addressbook/gui/widgets/e-addressbook-view.c:786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1548
+#: addressbook/gui/widgets/e-addressbook-view.c:790
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1517
-#: addressbook/gui/widgets/e-addressbook-view.c:789
+#: addressbook/gui/contact-editor/e-contact-editor.c:1549
+#: addressbook/gui/widgets/e-addressbook-view.c:793
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1518
+#: addressbook/gui/contact-editor/e-contact-editor.c:1550
 msgid "Mobile"
 msgstr "Móvil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1519
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
-#: mail/mail-config.glade.h:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1551
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1520
-#: addressbook/gui/widgets/e-addressbook-view.c:791
+#: addressbook/gui/contact-editor/e-contact-editor.c:1552
+#: addressbook/gui/widgets/e-addressbook-view.c:795
 msgid "Other Fax"
 msgstr "Otro fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1521
-#: addressbook/gui/widgets/e-addressbook-view.c:792
+#: addressbook/gui/contact-editor/e-contact-editor.c:1553
+#: addressbook/gui/widgets/e-addressbook-view.c:796
 msgid "Pager"
 msgstr "Papel"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1522
+#: addressbook/gui/contact-editor/e-contact-editor.c:1554
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1523
-#: addressbook/gui/widgets/e-addressbook-view.c:793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1555
+#: addressbook/gui/widgets/e-addressbook-view.c:797
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1524
-#: addressbook/gui/widgets/e-addressbook-view.c:794
+#: addressbook/gui/contact-editor/e-contact-editor.c:1556
+#: addressbook/gui/widgets/e-addressbook-view.c:798
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1525
+#: addressbook/gui/contact-editor/e-contact-editor.c:1557
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "Añadir Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "Editar Todo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:772
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:776
 msgid "Full Name"
 msgstr "Nombre Completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "Correo electrónico"
 
@@ -1150,6 +1131,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ocultar direcciónes al mandar correo a esta lista"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "_Remove"
 msgstr "_Quitar"
 
@@ -1158,7 +1140,7 @@ msgid "contact-list-editor"
 msgstr "editor-de-listas-de-contactos"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 msgid "Contact List Editor"
 msgstr "Editor de Lastas de Contactos"
 
@@ -1207,7 +1189,12 @@ msgstr ""
 msgid "_Change Anyway"
 msgstr "_Cambiar de todos modos"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: addressbook/gui/search/e-addressbook-search-dialog.c:146
+#: widgets/misc/e-filter-bar.c:242
+msgid "Advanced Search"
+msgstr "Búqueda avanzada"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
 #: mail/mail-search.c:258
 msgid "Search"
 msgstr "Buscar"
@@ -1320,47 +1307,53 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
 #: addressbook/gui/widgets/e-addressbook-view.c:610
-#: addressbook/gui/widgets/e-addressbook-view.c:670
-#: addressbook/gui/widgets/e-addressbook-view.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:1286
 #: ui/evolution-addressbook.xml.h:18
 msgid "Save as VCard"
 msgstr "Guardar como vCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 #: ui/evolution-addressbook.xml.h:25
 msgid "Send contact to other"
 msgstr "Enviar el contacto a otro"
 
 #
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 #: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:63
 #: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:675 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
-#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:679 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:267
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Borrar"
 
@@ -1375,7 +1368,7 @@ msgid "Success"
 msgstr "Exito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-shell.c:1534
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1619
 #: shell/e-storage.c:501
 msgid "Unknown error"
 msgstr "Error desconocido"
@@ -1425,131 +1418,131 @@ msgid "Error removing list"
 msgstr "Error eliminando lista"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1155
+#: addressbook/gui/widgets/e-addressbook-view.c:1159
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:770
+#: addressbook/gui/widgets/e-addressbook-view.c:774
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aquí para añadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:771
+#: addressbook/gui/widgets/e-addressbook-view.c:775
 msgid "File As"
 msgstr "Archivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:773
+#: addressbook/gui/widgets/e-addressbook-view.c:777
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:778
 msgid "Primary Phone"
 msgstr "Teléfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:779
 msgid "Assistant Phone"
 msgstr "Teléfono del Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:776
+#: addressbook/gui/widgets/e-addressbook-view.c:780
 msgid "Business Phone"
 msgstr "Teléfono del Trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:777
+#: addressbook/gui/widgets/e-addressbook-view.c:781
 msgid "Callback Phone"
 msgstr "Teléfono para rellamadas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:778
+#: addressbook/gui/widgets/e-addressbook-view.c:782
 msgid "Company Phone"
 msgstr "Teléfono de la compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:779
+#: addressbook/gui/widgets/e-addressbook-view.c:783
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:780
+#: addressbook/gui/widgets/e-addressbook-view.c:784
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Business Address"
 msgstr "Dirección del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:782
+#: addressbook/gui/widgets/e-addressbook-view.c:786
 msgid "Home Address"
 msgstr "Dirección de su casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:783
+#: addressbook/gui/widgets/e-addressbook-view.c:787
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:784
+#: addressbook/gui/widgets/e-addressbook-view.c:788
 msgid "Car Phone"
 msgstr "Teléfono del coche"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:787
+#: addressbook/gui/widgets/e-addressbook-view.c:791
 msgid "Business Phone 2"
 msgstr "Teléfono del trabajo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:788
+#: addressbook/gui/widgets/e-addressbook-view.c:792
 msgid "Home Phone 2"
 msgstr "Teléfono de casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:790
+#: addressbook/gui/widgets/e-addressbook-view.c:794
 msgid "Other Phone"
 msgstr "Otro teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:795
+#: addressbook/gui/widgets/e-addressbook-view.c:799
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:796
+#: addressbook/gui/widgets/e-addressbook-view.c:800
 msgid "Other Address"
 msgstr "Otra dirección"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:799
+#: addressbook/gui/widgets/e-addressbook-view.c:803
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:804
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:805
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/widgets/e-addressbook-view.c:806
 msgid "Title"
 msgstr "Título"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:807
 msgid "Profession"
 msgstr "Profesión"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:808
 msgid "Manager"
 msgstr "Encargado"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:806
+#: addressbook/gui/widgets/e-addressbook-view.c:810
 msgid "Nickname"
 msgstr "Nick"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:811
 msgid "Spouse"
 msgstr "Cónyuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:812
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:809
+#: addressbook/gui/widgets/e-addressbook-view.c:813
 msgid "Free-busy URL"
 msgstr "URL de disponibilidad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1152
+#: addressbook/gui/widgets/e-addressbook-view.c:1156
 msgid "Done."
 msgstr "Hecho."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1184
+#: addressbook/gui/widgets/e-addressbook-view.c:1188
 msgid "Removing cards..."
 msgstr "Eliminando tarjetas..."
 
@@ -1743,6 +1736,20 @@ msgstr "Ancho:"
 msgid "_Font..."
 msgstr "_Fuente..."
 
+#: addressbook/printing/e-contact-print.c:1091
+msgid "Print cards"
+msgstr "Imprimir tarjetas"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+msgid "Print card"
+msgstr "Imprimir tarjeta"
+
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Imprimir sobre"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1903,14 +1910,14 @@ msgstr "No se puede inicializar gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "No pude crear la factoría del servicio de la alarma de notificación"
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1353 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
@@ -1919,131 +1926,127 @@ msgstr "%a, %d de %b de %Y"
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr "%B"
+#: calendar/gui/calendar-commands.c:426
+#, c-format
+msgid "%d"
+msgstr "%d"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
-#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
-msgstr "%B %Y"
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#. 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/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%d de %B"
 
-#: calendar/gui/calendar-commands.c:570
+#: calendar/gui/calendar-commands.c:579
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "No pude mostrar el calendario.  Por favor compruebe su ORBit y su OAF."
 
-#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:964
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "Público"
-
-#: calendar/gui/calendar-model.c:361 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:364 calendar/gui/calendar-model.c:968
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:367 calendar/gui/dialogs/alarm-page.c:349
-#: calendar/gui/dialogs/alarm-page.c:385
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:676
-#: calendar/gui/dialogs/meeting-page.c:1226
-#: calendar/gui/dialogs/meeting-page.c:1242
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Desconocido"
+#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "Público"
 
-#: calendar/gui/calendar-model.c:464
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:464
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:466
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:466
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:504 calendar/gui/calendar-model.c:1150
-#: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:641
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:506 calendar/gui/calendar-model.c:1152
-#: calendar/gui/calendar-model.c:1688
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:640
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:508 calendar/gui/calendar-model.c:1154
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:639
 msgid "Low"
 msgstr "Baja"
 
-#: calendar/gui/calendar-model.c:544 calendar/gui/calendar-model.c:1206
-#: calendar/gui/e-calendar-table.c:383
-msgid "Transparent"
-msgstr "Transparente"
+#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+msgid "Free"
+msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:547 calendar/gui/calendar-model.c:1208
-#: calendar/gui/e-calendar-table.c:382
-msgid "Opaque"
-msgstr "Opaco"
+#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:701 calendar/gui/calendar-model.c:1260
-#: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "Sin comenzando"
 
-#: calendar/gui/calendar-model.c:704 calendar/gui/calendar-model.c:1262
-#: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "En proceso"
 
-#: calendar/gui/calendar-model.c:707 calendar/gui/calendar-model.c:1264
-#: calendar/gui/dialogs/meeting-page.c:648
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Completado"
 
-#: calendar/gui/calendar-model.c:710 calendar/gui/calendar-model.c:1266
-#: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Cancelar"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:860 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:863 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:868
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2054,28 +2057,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:948
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
-"La clasificación debe ser 'Pública', 'Privada', 'Confidencial' o 'Ninguna'"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:962 calendar/gui/calendar-model.c:1204
-#: calendar/gui/calendar-model.c:1258
-#: calendar/gui/dialogs/e-timezone-dialog.c:202
-#: calendar/gui/dialogs/meeting-page.c:327
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
-#: mail/mail-account-gui.c:1394 mail/mail-accounts.c:134
-#: mail/mail-accounts.c:388 mail/mail-config.glade.h:62
-#: shell/e-shell-view.c:1375 widgets/misc/e-cell-date-edit.c:240
-#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
-#: widgets/misc/e-dateedit.c:1471
-msgid "None"
-msgstr "Ninguno"
-
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2085,42 +2067,50 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1094
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100"
 
-#: calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "La prioridad debe ser 'Alta', 'Normal', 'Baja' o 'Indefinida'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1148
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Sin definir"
 
-#: calendar/gui/calendar-model.c:1189
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "La transparencia debe ser 'Transparente', 'Opaca' o 'Ninguna'."
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1404
+#: mail/mail-accounts.c:134 mail/mail-accounts.c:374
+#: mail/mail-config.glade.h:47 shell/e-shell-view.c:1380
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-dateedit.c:1356 widgets/misc/e-dateedit.c:1471
+msgid "None"
+msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:1690
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "Recurriendo"
 
-#: calendar/gui/calendar-model.c:1692
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1698 calendar/gui/dialogs/meeting-page.c:620
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1158
-#: calendar/gui/dialogs/meeting-page.c:1254
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1279
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1698 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1280
 msgid "No"
 msgstr "No"
 
@@ -2152,16 +2142,16 @@ msgstr "La descripción contiene"
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:349
+#: calendar/gui/cal-search-bar.c:378
 msgid "Category:"
 msgstr "Categorías:"
 
 #. All, Unmatched, separator items
-#: calendar/gui/cal-search-bar.c:469
+#: calendar/gui/cal-search-bar.c:498
 msgid "All"
 msgstr "Todo"
 
-#: calendar/gui/cal-search-bar.c:474
+#: calendar/gui/cal-search-bar.c:503
 msgid "Unfiled"
 msgstr "Sin archivar"
 
@@ -2298,6 +2288,17 @@ msgstr "Enviar un correo"
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
+#: calendar/gui/dialogs/alarm-page.c:349 calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1251
+#: calendar/gui/dialogs/meeting-page.c:1267
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Desconocido"
+
 #: calendar/gui/dialogs/alarm-page.c:361
 msgid "before start of appointment"
 msgstr "antes comenzar la cita"
@@ -2315,14 +2316,12 @@ msgid "after end of appointment"
 msgstr "tras finalizar la cita"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr "Bases"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
-#: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Fecha/Hora:"
@@ -2332,8 +2331,7 @@ msgid "Reminders"
 msgstr "Recordatorios"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
@@ -2342,12 +2340,11 @@ msgstr "Resumen:"
 msgid "_Options..."
 msgstr "_Opciónes..."
 
-#. 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:34
 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:35
 msgid "before"
 msgstr "antes"
 
@@ -2364,7 +2361,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:112
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:113
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -2401,152 +2398,139 @@ msgid "60 minutes"
 msgstr "60 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:1013
-msgid "Calendar"
-msgstr "Calendario"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Calendar Preferences"
 msgstr "Preferencias del calendario"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for overdue tasks"
 msgstr "Color para las tareas fuera de plazo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Color for tasks due today"
 msgstr "Color para las tareas para hoy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Colors for Tasks"
-msgstr "Color para las Tareas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Compress weekends in month view"
 msgstr "Comprimir fines de semana en la vista mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Date Navigator"
-msgstr "Navegador de Fechas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: mail/mail-config.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: mail/mail-config.glade.h:26
 msgid "Display"
 msgstr "Mostrar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "End of day:"
 msgstr "Fin del día:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "First day of week:"
 msgstr "Primer día de la semana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Fri"
 msgstr "Vier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Viernes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Lunes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Overdue tasks"
-msgstr "Tareas fuera de plazo"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "Overdue tasks:"
+msgstr "Tareas fuera de plazo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Sat"
 msgstr "Sab"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Sábado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Mostrar la hora del final de las citas en las vistas semanales y mensuales"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Show week numbers"
-msgstr "Mostrar los números de las semanas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid "Show week numbers in date navigator"
+msgstr "Mostrar los números de las semanas en el navegador de fechas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Start of day:"
 msgstr "Comienzo del día:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sun"
 msgstr "Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 #: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Task List"
 msgstr "Lista de Tareas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Tasks due today"
-msgstr "Tareas de plazo hoy"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Tasks due today:"
+msgstr "Tareas de plazo hoy:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Thu"
 msgstr "Jue"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Jueves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time"
 msgstr "Hora"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time divisions:"
 msgstr "Divisiónes de tiempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Time format:"
 msgstr "Formato del tiempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Time zone:"
 msgstr "Zona horaria:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Martes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Wed"
 msgstr "Mier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Work Week"
 msgstr "Semana Laboral"
 
@@ -2612,59 +2596,59 @@ 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:154
-#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2116
 msgid " to "
 msgstr " a "
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#: calendar/gui/e-itip-control.c:634 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr "(Completado "
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#: calendar/gui/e-itip-control.c:636 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Completado "
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+#: calendar/gui/e-itip-control.c:641 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Falta "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#: calendar/gui/e-itip-control.c:643 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Falta "
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:454
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:459
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:462
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:465
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:479
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: calendar/gui/dialogs/comp-editor.c:843 mail/mail-callbacks.c:1485
 #: mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: calendar/gui/dialogs/comp-editor.c:847 mail/mail-callbacks.c:1490
 #: mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
@@ -2673,12 +2657,12 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Sobreescribirlo?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:910 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1063
 msgid "Unable to obtain current version!"
 msgstr "¡Imposible obtener versión actual!"
 
@@ -2724,6 +2708,18 @@ 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/e-delegate-dialog.glade.h:1
+msgid "Addressbook..."
+msgstr "Agenda de direcciones..."
+
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+msgid "Delegate To:"
+msgstr "Delegado A:"
+
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+msgid "Enter Delegate"
+msgstr "Escribir delegado"
+
 #: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
 msgid "Select a Time Zone"
 msgstr "Selecciones un Zona Horaria"
@@ -2746,20 +2742,20 @@ msgstr ""
 "yseleccionar una zona horaria.\n"
 " Use el botón derecho del ratón para salir del zoom."
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "Recurrencia"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 msgid "Meeting"
 msgstr "Reunión"
 
@@ -2767,162 +2763,174 @@ msgstr "Reunión"
 msgid "A_ll day event"
 msgstr "Evento para todo e_l día"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+msgid "B_usy"
+msgstr "Oc_upado"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Clasificación"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+msgid "Con_fidential"
+msgstr "Con_fidencial"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "Fecha y Hora"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+msgid "F_ree"
+msgstr "Lib_re"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Show Time As"
+msgstr "Mostrar tiempo como"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "Resu_men:"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: calendar/gui/dialogs/meeting-page.c:551
-#: calendar/gui/dialogs/meeting-page.c:568
-#: calendar/gui/dialogs/meeting-page.c:1154
-#: calendar/gui/dialogs/meeting-page.c:1222
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1179
+#: calendar/gui/dialogs/meeting-page.c:1247
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1248
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/dialogs/meeting-page.c:555
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:1224
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1249
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/dialogs/meeting-page.c:557
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:1225
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1250
 msgid "Room"
 msgstr "Habitación"
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1263
 msgid "Chair"
 msgstr "Silla"
 
-#: calendar/gui/dialogs/meeting-page.c:588
-#: calendar/gui/dialogs/meeting-page.c:605
-#: calendar/gui/dialogs/meeting-page.c:1156
-#: calendar/gui/dialogs/meeting-page.c:1239
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1181
+#: calendar/gui/dialogs/meeting-page.c:1264
 msgid "Required Participant"
 msgstr "Participantes requeridos"
 
-#: calendar/gui/dialogs/meeting-page.c:590
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:1240
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1265
 msgid "Optional Participant"
 msgstr "Participantes opcional"
 
-#: calendar/gui/dialogs/meeting-page.c:592
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:1241
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1266
 msgid "Non-Participant"
 msgstr "No participan"
 
-#: calendar/gui/dialogs/meeting-page.c:638
-#: calendar/gui/dialogs/meeting-page.c:661
-#: calendar/gui/dialogs/meeting-page.c:1164
-#: calendar/gui/dialogs/meeting-page.c:1267
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1189
+#: calendar/gui/dialogs/meeting-page.c:1292
 msgid "Needs Action"
 msgstr "Necesita acción"
 
-#: calendar/gui/dialogs/meeting-page.c:640
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1293
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/dialogs/meeting-page.c:642
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1294
 msgid "Declined"
 msgstr "Rechazado"
 
-#: calendar/gui/dialogs/meeting-page.c:644
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1295
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: calendar/gui/dialogs/meeting-page.c:646
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1296
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "In Process"
 msgstr "En proceso"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr "¡Esa persona ya está participando en la reunión!"
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:838
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/dialogs/meeting-page.c:765
-#: calendar/gui/dialogs/meeting-page.c:813
-#: calendar/gui/dialogs/meeting-page.c:933
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:838
+#: calendar/gui/dialogs/meeting-page.c:958
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:838
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:838
 msgid "Non-Participants"
 msgstr "No participan"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:916
 msgid "Sent By:"
 msgstr "Enviado Por:"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1467
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
@@ -2952,26 +2960,25 @@ msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 msgid "RSVP"
-msgstr ""
+msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
 msgid "Role"
 msgstr "Papel"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 e-util/e-categories-config.c:94
-#: filter/libfilter-i18n.h:49 mail/message-list.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
+#: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Estado"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:103
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:83
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizador:"
@@ -3017,9 +3024,9 @@ msgstr "º"
 msgid "occurrences"
 msgstr "ocurrencias"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
-msgstr "Recurrencia personalizada"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
+msgstr "Aña_dir"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3030,25 +3037,29 @@ msgid "Exceptions"
 msgstr "Excepciones"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "No recurrence"
-msgstr "Sin recurrencia"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "Regla de recurrencia"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "Recurrencia simple"
+msgid "_Custom recurrence"
+msgstr "Re_currencia personalizada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr "_Modificar"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "_No recurrence"
+msgstr "Si_n recurrencia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Simple recurrence"
+msgstr "Recurrencia _simple"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "para"
@@ -3090,159 +3101,154 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr "La entrada del diario ha cambiado. ¿Enviar una versión actualizada?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "Date Completed:"
-msgstr "Fecha Completada:"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-msgid "Delegated From:"
-msgstr "Delegado Por:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Completo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Delegated To:"
-msgstr "Delegado A:"
+msgid "Date Completed:"
+msgstr "Fecha Completada:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-msgid "No one"
-msgstr "Ninguno"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "Progreso"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 #: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "Tarea"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "_Prioridad:"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leto:"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "E_stado:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "Progreso"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+msgid "Assignment"
+msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descripción:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "Fecha de Ini_cio:"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Fecha _de Fin:"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
-msgstr "_Prioridad:"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
-msgstr "E_stado:"
-
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3363
-#: calendar/gui/e-week-view.c:3203 mail/folder-browser.c:1278
+#: calendar/gui/e-calendar-table.c:849 calendar/gui/e-day-view.c:3378
+#: calendar/gui/e-week-view.c:3230 mail/folder-browser.c:1278
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3372
-#: calendar/gui/e-week-view.c:3212 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:853 calendar/gui/e-day-view.c:3387
+#: calendar/gui/e-week-view.c:3239 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3374
-#: calendar/gui/e-week-view.c:3214 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:855 calendar/gui/e-day-view.c:3389
+#: calendar/gui/e-week-view.c:3241 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:32 ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3349
-#: calendar/gui/e-day-view.c:3376 calendar/gui/e-week-view.c:3190
-#: calendar/gui/e-week-view.c:3216 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:857 calendar/gui/e-day-view.c:3364
+#: calendar/gui/e-day-view.c:3391 calendar/gui/e-week-view.c:3217
+#: calendar/gui/e-week-view.c:3243 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:35 ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:862
 msgid "_Mark as Complete"
 msgstr "_Marcar como completo"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:864
 msgid "_Delete this Task"
 msgstr "_Borrar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:867
 msgid "_Mark Tasks as Complete"
 msgstr "_Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:869
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1137
+#: calendar/gui/e-calendar-table.c:1129
 msgid "Click here to add a task"
 msgstr "Pulse aquí para añadir una tarea"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% Completo"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmas"
@@ -3276,22 +3282,18 @@ msgstr "Posición geográfica"
 msgid "Priority"
 msgstr "Prioridad"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Fecha de Inicio"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:15
 msgid "Summary"
 msgstr "Resumen"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Transparency"
-msgstr "Transparencia"
-
 #: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
@@ -3303,141 +3305,141 @@ 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:1339
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. 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:1366
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:578 calendar/gui/e-week-view.c:311
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:581 calendar/gui/e-week-view.c:314
+#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3342
+#: calendar/gui/e-day-view.c:3357
 msgid "New _Appointment"
 msgstr "Nueva cit_a"
 
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:3359 calendar/gui/e-week-view.c:3212
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el día"
 
-#: calendar/gui/e-day-view.c:3354 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3369 calendar/gui/e-week-view.c:3222
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3356 calendar/gui/e-week-view.c:3197
+#: calendar/gui/e-day-view.c:3371 calendar/gui/e-week-view.c:3224
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3365 calendar/gui/e-week-view.c:3205
+#: calendar/gui/e-day-view.c:3380 calendar/gui/e-week-view.c:3232
 msgid "_Delete this Appointment"
 msgstr "_Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:3384 calendar/gui/e-week-view.c:3230
+#: calendar/gui/e-day-view.c:3399 calendar/gui/e-week-view.c:3257
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3386 calendar/gui/e-week-view.c:3232
+#: calendar/gui/e-day-view.c:3401 calendar/gui/e-week-view.c:3259
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3388 calendar/gui/e-week-view.c:3234
+#: calendar/gui/e-day-view.c:3403 calendar/gui/e-week-view.c:3261
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/e-itip-control.c:697
 msgid "This is an event that can be added to your calendar."
 msgstr "Este es un evento que puede ser añadido a su calendario."
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:700
 msgid "This is a meeting request."
 msgstr "Esta es una petición de reunión."
 
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:703
 msgid "This is one or more additions to a current meeting."
 msgstr "Esto es una o más adiciones a su encuentro actual."
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a request for the latest event information."
 msgstr "Esta es una petición sobre la última infromación del evento."
 
-#: calendar/gui/e-itip-control.c:706
+#: calendar/gui/e-itip-control.c:709
 msgid "This is a reply to a meeting request."
 msgstr "Esta es una respuesta a una petición de encuentro."
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:712
 msgid "This is an event cancellation."
 msgstr "Esta es la cancelación de un evento."
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:715 calendar/gui/e-itip-control.c:755
+#: calendar/gui/e-itip-control.c:783
 msgid "The message is not understandable."
 msgstr "Este mensaje no es comprensible."
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:740
 msgid "This is an task that can be added to your calendar."
 msgstr "Esta es una tarea que puede ser añadida a su calendario."
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a task request."
 msgstr "Esta es una petición de tarea."
 
-#: calendar/gui/e-itip-control.c:743
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a request for the latest task information."
 msgstr "Esta es una petición para la última información de la tarea."
 
-#: calendar/gui/e-itip-control.c:746
+#: calendar/gui/e-itip-control.c:749
 msgid "This is a reply to a task request."
 msgstr "Esta es una respuesta a una petición de tarea."
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:752
 msgid "This is an task cancellation."
 msgstr "Esto es una cancelación de tarea."
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:774
 msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:780
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:837
 msgid "The message does not appear to be properly formed"
 msgstr "Este mensaje no parece haber sido creado correctamente"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:856
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje solo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:877
+#: calendar/gui/e-itip-control.c:880
 msgid "The information contained in this attachment was not valid"
 msgstr "La información dentro de este adjunto no era válida"
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:992
 msgid "I couldn't update your calendar file!\n"
 msgstr "¡No pude actualizar el archivo de su calendario!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:1018
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "¡No pude quitar el elemento del archivo de su calendario!\n"
 
@@ -3488,15 +3490,7 @@ 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"
 
-#. 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:1436
-#: my-evolution/e-summary-calendar.c:230
-msgid "%d %B"
-msgstr "%d de %B"
-
-#: calendar/gui/e-week-view.c:3183 calendar/gui/e-week-view.c:3221
+#: calendar/gui/e-week-view.c:3210 calendar/gui/e-week-view.c:3248
 msgid "New _Appointment..."
 msgstr "Nueva cit_a..."
 
@@ -3531,41 +3525,41 @@ msgid "Go To Date"
 msgstr "Ir a una fecha"
 
 #: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
+msgstr "Ir a hoy"
+
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Enero"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Julio"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Junio"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Marzo"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Mayo"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "Noviembre"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Octubre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "_Ir a hoy"
-
 #: calendar/gui/itip-utils.c:228
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
@@ -3722,8 +3716,8 @@ msgstr "Vier"
 msgid "Sa"
 msgstr "Sab"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
-#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:1014
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:212
+#: my-evolution/e-summary-tasks.c:228 shell/e-shortcuts.c:1025
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tareas"
@@ -3761,7 +3755,7 @@ msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1866 my-evolution/e-summary.c:511
+#: mail/mail-callbacks.c:1854 my-evolution/e-summary.c:511
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
@@ -3775,7 +3769,7 @@ msgstr "Imprimir Elemento"
 msgid "Print Setup"
 msgstr "Configurar impresión"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrará la carpeta de tareas"
 
@@ -3914,7 +3908,7 @@ msgstr ""
 "has-categories? espera que todos los argumentos sean cadenas o que uno y "
 "solo un argumento sea un booleano falso (#f)"
 
-#: calendar/pcs/query.c:978
+#: calendar/pcs/query.c:967
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 "La evaluación de la expresión de búsqueda no ha devuelto un valor booleano"
@@ -4019,7 +4013,7 @@ msgstr "Error parseando filtro: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
@@ -4046,12 +4040,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(concordar todas) requiere un único resultado booleano"
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Realizando búsqueda en cabezera desconocida: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inválido en el contenido del cuerpo, esperando una cadena"
 
@@ -4165,13 +4159,13 @@ msgid "No plaintext to sign."
 msgstr "No hay ningún texto plano a firmar"
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1079 camel/camel-pgp-context.c:1294
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "No se dio contraseña"
 
 #: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1086
-#: camel/camel-pgp-context.c:1301
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "No pude comunicar con GPG/PGP: %s"
@@ -4189,15 +4183,15 @@ msgstr "No hay ningún texto plano a verificar."
 msgid "Couldn't create temp file: %s"
 msgstr "No pude crear archivo temporal: %s"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr "No hay ningún texto plano a encriptar."
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "No ha especificado destinatarios"
 
-#: camel/camel-pgp-context.c:1286
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr "No hay ningún texto cifrado a desencriptar."
 
@@ -4243,7 +4237,7 @@ msgstr "(servidor desconocido)"
 
 #: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
 #: camel/camel-remote-store.c:484
-#: camel/providers/imap/camel-imap-command.c:382
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
@@ -4374,6 +4368,32 @@ msgstr "Esta opción conectará con el servidor usando una simple contraseña."
 msgid "Unknown authentication state."
 msgstr "Estado de la autenticación desconocido."
 
+#: 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:52
+msgid "Password"
+msgstr "Clave"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr "POP antes de SMTP"
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr "Esta opción autorizará conexiónes POP antes de intentar SMTP"
+
+#: camel/camel-sasl-popb4smtp.c:107
+msgid "POP Source URI"
+msgstr "URI de la fuente POP"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr "Autenticación POP antes de SMTP usando un transporte desconocido"
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr "Autenticación POP antes de SMTP usando una fuente no pop"
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -4422,12 +4442,12 @@ msgstr "Proveedor de correo de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para leer correo como una búsqueda de otras carpetas"
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hay proveedor para el protocolo `%s'"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4536,64 +4556,64 @@ 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-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Respuesta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "La respuesta del servidor terminó demasiado pronto."
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La respuesta del servidor IMAP no contenía información de %s"
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente a respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 msgid "Folder was destroyed and recreated on server."
 msgstr "La carpeta fue destruida y recreada en el servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:437
+#: camel/providers/imap/camel-imap-folder.c:435
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1478
+#: camel/providers/imap/camel-imap-folder.c:1902
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1620
+#: camel/providers/imap/camel-imap-folder.c:1701
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo informción de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1626
 msgid "Scanning for new messages"
 msgstr "Buscando mensajes nuevos"
 
-#: camel/providers/imap/camel-imap-folder.c:1956
+#: camel/providers/imap/camel-imap-folder.c:1935
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -4602,7 +4622,7 @@ msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 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:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "Comprobando si hay correo nuevo"
 
@@ -4610,7 +4630,7 @@ msgstr "Comprobando si hay correo nuevo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:651
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:653
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -4679,7 +4699,7 @@ msgstr ""
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1023
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No está permitido que la carpeta raiz contenga subcarpetas"
 
@@ -4933,13 +4953,13 @@ msgstr "La carpeta `%s' no esta vacía. No fue borrada."
 #. 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"
+msgid "Summarizing 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"
+msgid "Could not open folder: %s: summarizing 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
@@ -4949,24 +4969,21 @@ 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"
+msgid "Cannot summarize 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
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1528
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1549
 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"
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "No pude abrir la carpeta para resumirla: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5069,6 +5086,17 @@ msgstr "Las carpetas de correo no pueden ser renombradas"
 msgid "Spool folders cannot be deleted"
 msgstr "Las carpetas de correo no pueden ser borradas"
 
+#: 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-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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5161,39 +5189,39 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "No pude abrir o crear el archivo .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:193
 msgid "Retrieving POP summary"
 msgstr "Obteniendo resumen POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:199
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "No pude comprobar si hay nuevos mensajes en el servidor POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:239
 msgid "Could not open folder: message listing was incomplete."
 msgstr "No pude abrir la carpeta: listados de los mensajes incompletos."
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "No hay mensajes con uid %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Obteniendo mensaje POP %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:332
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "No pude obtener el mensaje: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:348
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "No pude obtener los mensajes del servidor POP %s: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "No message with uid %s"
+msgstr "No hay mensajes con uid %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:375
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Obteniendo mensaje POP %d"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "Almacén del mensaje"
@@ -5207,7 +5235,7 @@ msgstr "Dejar mensajes en el servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar tras %s día(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:68
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
@@ -5300,7 +5328,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:90
+#: mail/mail-config.glade.h:70
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5353,7 +5381,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:83
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:63
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5507,7 +5535,7 @@ msgstr "No puedo enviar el mensaje: dirección del remitente no definida."
 msgid "Cannot send message: sender address not valid."
 msgstr "No puedo enviar el mensaje: dirección del remitente no válida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:594
+#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
@@ -5673,52 +5701,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Presione aquí para acceder a la agenda"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 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:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5731,7 +5759,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Adjuntar un fichero"
 
-#: composer/e-msg-composer.c:670
+#: composer/e-msg-composer.c:687
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5740,7 +5768,7 @@ msgstr ""
 "No puedo abrir el archivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:683
+#: composer/e-msg-composer.c:700
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5749,29 +5777,29 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:890
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:899
 msgid "Warning!"
 msgstr "¡Aviso!"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:901
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, ¿Sobreescribir?"
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:923
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:943
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:1014
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5779,16 +5807,16 @@ msgstr ""
 "No pude abrir la carpeta de borradores para esta cuenta.\n"
 "¿Quiere usar la carpeta de borradores predeterminada?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1064
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1072
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1078
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5797,7 +5825,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1084
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5806,7 +5834,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1093
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5815,7 +5843,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1193
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
@@ -5823,7 +5851,7 @@ msgstr ""
 "Evolution ha encontrado archivos no guardados de una sesión previas.\n"
 "¿Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1341
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5833,24 +5861,24 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1348 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:215
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1371
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1520
 msgid "Insert File"
 msgstr "Insertar Archivo"
 
-#: composer/e-msg-composer.c:1867 composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:1894 composer/e-msg-composer.c:2294
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2357
+#: composer/e-msg-composer.c:2384
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
@@ -5878,82 +5906,6 @@ msgstr "tarjeta de dirección"
 msgid "calendar information"
 msgstr "información del calendario"
 
-#: e-util/e-categories-config.c:64
-msgid "Birthday"
-msgstr "Cumpleaños"
-
-#: e-util/e-categories-config.c:68
-msgid "Competition"
-msgstr "Competición"
-
-#: e-util/e-categories-config.c:70
-msgid "Favorites"
-msgstr "Favoritos"
-
-#: e-util/e-categories-config.c:72
-msgid "Gifts"
-msgstr "Regalos"
-
-#: e-util/e-categories-config.c:74
-msgid "Goals/Objectives"
-msgstr "Metas/Objetivos"
-
-#: e-util/e-categories-config.c:76
-msgid "Holiday"
-msgstr "Vacaciones"
-
-#: e-util/e-categories-config.c:78
-msgid "Holiday Cards"
-msgstr "Tarjetas de vacaciones"
-
-#: e-util/e-categories-config.c:80
-msgid "Hot Contacts"
-msgstr "Contactos interesantes"
-
-#: e-util/e-categories-config.c:82
-msgid "Ideas"
-msgstr "Ideas"
-
-#: e-util/e-categories-config.c:84
-msgid "International"
-msgstr "Internacional"
-
-#: e-util/e-categories-config.c:86
-msgid "Key Customer"
-msgstr "Cliente clave"
-
-#: e-util/e-categories-config.c:88
-msgid "Miscellaneous"
-msgstr "Miscelanea"
-
-#: e-util/e-categories-config.c:90
-msgid "Personal"
-msgstr "Personal"
-
-#: e-util/e-categories-config.c:92
-msgid "Phone Calls"
-msgstr "Llamadas de teléfono"
-
-#: e-util/e-categories-config.c:96
-msgid "Strategies"
-msgstr "Estrategias"
-
-#: e-util/e-categories-config.c:98
-msgid "Suppliers"
-msgstr "Suministradores"
-
-#: e-util/e-categories-config.c:100
-msgid "Time & Expenses"
-msgstr "Hora & Gastos"
-
-#: e-util/e-categories-config.c:102
-msgid "VIP"
-msgstr "VIP"
-
-#: e-util/e-categories-config.c:104
-msgid "Waiting"
-msgstr "Esperando"
-
 #. strptime format for a date.
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
 #: e-util/e-time-utils.c:239
@@ -6151,20 +6103,20 @@ msgstr ""
 "Oops, te has olvidado de elegir una carpeta.\n"
 "Por favor vuelve y especifica una carpeta válida donde entregar el correo."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:790
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:796
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "Escribir URI de la carpeta"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<pinche aquí para seleccionar una carpeta>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:197
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6177,50 +6129,47 @@ msgstr ""
 msgid "Test"
 msgstr "Prueba"
 
-#: filter/filter-rule.c:633
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nombre de la regla:"
 
-#: filter/filter-rule.c:637
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Sin título"
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:672
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Ejecutar acciones"
 
-#: filter/filter-rule.c:676
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
-#: filter/filter-rule.c:681
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "si se cumple algún criterio"
 
-#: filter/filter-rule.c:692
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Añadir criterio"
 
-#: filter/filter-rule.c:777
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:777
+#: filter/filter-rule.c:770
 msgid "outgoing"
 msgstr "saliente"
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
-#: my-evolution/e-summary-preferences.c:1161
-#: my-evolution/e-summary-preferences.c:1209
-#: my-evolution/e-summary-preferences.c:1271
+#: filter/filter.glade.h:1
 msgid "Add"
 msgstr "Añadir"
 
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+#: filter/filter.glade.h:3
 msgid "Edit"
 msgstr "Editar"
 
@@ -6264,192 +6213,193 @@ msgstr "con todas las carpetas locales y remotas activas"
 msgid "with all local folders"
 msgstr "con todas las carpetas locales"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign 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 "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "es"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "es mayor que"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "es menor que"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "no es"
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "Se recibió el mensaje"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "Se envió el mensaje"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "en o después de"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "en o antes de"
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "Leído"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "Expresión regular"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Puntuación"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1070
 msgid "Sender"
 msgstr "Remitente"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 msgid "Size (kB)"
 msgstr "Tamaño (kB)"
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "suena como"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "Fuente de la cuenta"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "Cabecera específica"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "comienza por"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "contiene"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "no contiene"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "no acaba en"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "no existe"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "no suena como"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "no comienza por"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "finaliza con"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "es mayor que"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "es menor que"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "no es"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "es"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr "en o después de"
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr "en o antes de"
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "suena como"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "comienza por"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "estaba después de"
@@ -6486,7 +6436,7 @@ msgid "Import"
 msgstr "Importar"
 
 #: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/pine-importer.c:632
 msgid "Mail"
 msgstr "Correo"
 
@@ -6609,8 +6559,8 @@ msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
 #: mail/folder-browser.c:900
-msgid "Store search as vFolder"
-msgstr "Guardar la búsqueda como una carpeta virtual"
+msgid "Create vFolder from Search"
+msgstr "Crear carpeta virtual de la búsqueda"
 
 #: mail/folder-browser.c:1245
 msgid "VFolder on _Subject"
@@ -6645,10 +6595,10 @@ msgid "Filter on _Mailing List"
 msgstr "Filtrar según la Lista de _Correo"
 
 #: mail/folder-browser.c:1280
-msgid "Resend"
-msgstr "Reenviar"
+msgid "R_esend..."
+msgstr "R_eenviar..."
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:96
 #: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Guardar _como..."
@@ -6657,7 +6607,7 @@ msgstr "Guardar _como..."
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:95
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
@@ -6697,7 +6647,7 @@ msgstr "_Mover a la carpeta..."
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1315 ui/evolution-mail-message.xml.h:98
 msgid "_Undelete"
 msgstr "_Recuperar"
 
@@ -6713,24 +6663,28 @@ msgstr "Aplicar filtro"
 msgid "Create Ru_le From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:1486
+#: mail/folder-browser.c:1487
 msgid "Filter on Mailing List"
 msgstr "Filtrar según la lista de correo"
 
-#: mail/folder-browser.c:1487
+#: mail/folder-browser.c:1488
 msgid "VFolder on Mailing List"
 msgstr "Carpeta virtual según la Lista de Correo"
 
-#: mail/folder-browser.c:1489
+#: mail/folder-browser.c:1490
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar según la lista de correo (%s)"
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1491
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Carpeta virtual según la Lista de Correo (%s)"
 
+#: mail/folder-info.c:60
+msgid "Getting Folder Information"
+msgstr "Obteniendo información de la carpeta"
+
 #: 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."
@@ -6792,15 +6746,15 @@ msgid "Evolution News Editor"
 msgstr "Editor de Noticias de Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:162
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:980
+#: mail/mail-account-gui.c:986
 msgid "Save signature"
 msgstr "Guardar firma"
 
-#: mail/mail-account-gui.c:986
+#: mail/mail-account-gui.c:992
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6818,7 +6772,7 @@ msgstr "(valores predeterminados)"
 msgid "Disable"
 msgstr "Deshabilitado"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:176
 msgid "Enable"
 msgstr "Habilitado"
 
@@ -6834,12 +6788,12 @@ msgstr "No borrar"
 msgid "Really delete account?"
 msgstr "¿Realmente quiere borrar realmente la cuenta?"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:495 mail/mail-accounts.c:499
 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 Close button and title
-#: mail/mail-accounts.c:742
+#: mail/mail-accounts.c:741
 msgid "Evolution Account Manager"
 msgstr "Administrador de cuentas de Evolution"
 
@@ -6867,7 +6821,7 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Añadir Regla de Filtro"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6879,7 +6833,7 @@ msgstr ""
 "recibir o escribir mensajes.\n"
 "¿Querría configurarlo ahora?"
 
-#: mail/mail-callbacks.c:149
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6887,7 +6841,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:161
+#: mail/mail-callbacks.c:160
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6895,11 +6849,11 @@ msgstr ""
 "Necesita configurar un transporte de\n"
 "correo para poder enviarlo."
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:184
 msgid "You have not set a mail transport method"
 msgstr "No has definido un sistema para enviar el correo"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:217
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6907,7 +6861,7 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "¿Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:252
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6919,37 +6873,37 @@ msgstr ""
 "cabecera Apparently-To.\n"
 "¿Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:338
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:389
 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:653
+#: mail/mail-callbacks.c:632
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "El día %s, %s escribió:"
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:893
 msgid "Forwarded message:\n"
 msgstr "Mensaje reenviado:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:990
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:992
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1361
 #, 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:1396
+#: mail/mail-callbacks.c:1383
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6957,7 +6911,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1417
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6965,24 +6919,24 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1429
 #, 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:1463
+#: mail/mail-callbacks.c:1450
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1534
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1536
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:1768
+#: mail/mail-callbacks.c:1759
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6991,19 +6945,19 @@ msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1778
+#: mail/mail-callbacks.c:1769
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:1825
+#: mail/mail-callbacks.c:1815
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:1873
+#: mail/mail-callbacks.c:1861
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresión del mensaje"
 
-#: mail/mail-callbacks.c:1968
+#: mail/mail-callbacks.c:1945
 #, 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?"
@@ -7053,83 +7007,75 @@ msgstr ""
 "usará para mostrar información."
 
 #. set window title
-#: mail/mail-config-druid.c:466
+#: mail/mail-config-druid.c:463
 msgid "Evolution Account Wizard"
 msgstr "Configurador de cuentas de Evolution"
 
-#: mail/mail-config.c:1522
+#: mail/mail-config.c:1570
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:1593 mail/mail-config.c:1596
+#: mail/mail-config.c:1641 mail/mail-config.c:1644
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
 #: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr " Comprobar tipos soportados "
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr "color"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL no está soportado en esta compilación de evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "Cuenta"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Información de la cuenta"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "Siempre encriptarme a mi mismo cuando envie correo cifrado"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "Siempre encriptarme a mi mismo cuando envie correo cifrado"
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
-msgstr "Cargar imagenes fuera de la red"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
+msgstr "Firmar siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "Autentificación"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "Tipo de autentificación: "
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr "Comprobar el correo automáticamente cada"
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr "ID del certificado:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "Nuevo"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7145,272 +7091,228 @@ msgstr ""
 "\n"
 "Pulse «Finalizar» para guardar su configuración."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "Va_lores predeterminados"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
 msgstr "El estilo predeterminado de Reenvio es: "
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+msgid "Default character encoding: "
 msgstr "Juego de caracteres predeterminado: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr "ID digitales..."
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "Carpeta de borradores:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:30
+msgid "E_nable"
+msgstr "_Habilitado"
+
+#: mail/mail-config.glade.h:31 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Editar..."
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "Dirección de correo:"
-
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr "Vaciar papelera al salir"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:32
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "Nombre completo:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:33
 msgid "Get Digital ID..."
 msgstr "Obtener ID digital..."
 
-#: mail/mail-config.glade.h:42
-msgid "HTML Signature:"
-msgstr "Firma en HTML:"
-
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:34
 msgid "HTML signature file:"
 msgstr "Archivo de firma en HTML:"
 
-#: mail/mail-config.glade.h:44
-msgid "Highlight citations with"
-msgstr "Resaltadar citas con"
-
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:35
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:36
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:37
 msgid "In HTML mail"
 msgstr "Correo en HTML"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:38
 msgid "Inline"
 msgstr "Incluido en línea"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:39
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:51
-msgid "Load images if sender is in addressbook"
-msgstr "Cargar imágenes si el remitente esta el la agenda de direcciones"
-
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:40
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:41
 msgid "Mailbox location"
 msgstr "Localicación del Mailbox"
 
-#: mail/mail-config.glade.h:54
-msgid "Make this my default account"
-msgstr "Hacer de esta mi cuenta predeterminada"
-
-#: mail/mail-config.glade.h:55
-msgid "Mark messages as Read after"
-msgstr "Marcar mensajes como Leído tras"
+#: mail/mail-config.glade.h:42
+msgid "Make this my _default account"
+msgstr "Hacer de esta mi cuenta pre_determinada"
 
-#: mail/mail-config.glade.h:56
-msgid "Message list should display in a threaded fashion by default"
-msgstr "La lista de mensajes debe mostrarse enlazada por defecto"
+#: mail/mail-config.glade.h:43
+msgid "Message _preview should be displayed by default"
+msgstr "La _previsualización de los mensajes debe mostrarse por defecto"
 
-#: mail/mail-config.glade.h:57
-msgid "Message preview should be displayed by default"
-msgstr "La previsualización de los mensajes debe mostrarse por defecto"
+#: mail/mail-config.glade.h:44
+msgid "Message list should display in a _threaded fashion by default"
+msgstr "La lista de mensajes debe mostrarse enlazada por defec_to"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:60
-msgid "Never load images off the net"
-msgstr "No cargar nunca imágenes desde la red"
-
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "Noticias"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Información Opcional"
 
-#: mail/mail-config.glade.h:64
-msgid "Organization:"
-msgstr "Organización:"
-
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:50
 msgid "PGP Key ID:"
 msgstr "ID de la clave PGP:"
 
-#: mail/mail-config.glade.h:67
-msgid "PGP binary path:"
-msgstr "Localización del binario de PGP:"
-
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Elije un color"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:73
-msgid "Prompt when sending messages with an empty subject"
-msgstr "Preguntar al mandar mensajes con el asunto vacio"
+#: mail/mail-config.glade.h:55
+msgid "Prompt when sending messages with an _empty subject"
+msgstr "Pr_eguntar al mandar mensajes con el asunto vacio"
 
-#: mail/mail-config.glade.h:74
-msgid "Prompt when sending messages with only Bcc recipients defined"
-msgstr "Preguntar al mandar mensajes que tan solo tengan definido el Bcc"
+#: mail/mail-config.glade.h:56
+msgid "Prompt when sending messages with only _Bcc recipients defined"
+msgstr "Preguntar al mandar mensajes que tan solo tengan definido el _Cco"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:57
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:58
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:59
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:60
 msgid "Receiving Mail"
 msgstr "Recibiendo Mensajes"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:61
 msgid "Receiving Options"
 msgstr "Recibiendo Opciones"
 
-#: mail/mail-config.glade.h:80
-msgid "Remember PGP Passphrase until exit"
-msgstr "Recordar la frase de paso de PGP hasta salir del programa"
-
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:62
 msgid "Required Information"
 msgstr "Información Requerida"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:64
 msgid "Secure MIME"
 msgstr "MIME seguro"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:65
 msgid "Security"
 msgstr "Seguridad"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:66
+msgid "Select Filter Log file..."
+msgstr "Elega un archivo de log para los filtros..."
+
+#: mail/mail-config.glade.h:67
 msgid "Select PGP binary"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:87
-msgid "Send mail in HTML format by default."
-msgstr "Enviar el mensaje en formato HTML de forma predeterminada"
-
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:68
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:69
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:91 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:71 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Enviado"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:72
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:73
 msgid "Sent messages folder:"
 msgstr "Carpeta de mensajes enviados:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:74
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:75
 msgid "Server Type: "
 msgstr "Tipo de servidor:"
 
-#: mail/mail-config.glade.h:96
-msgid "Server requires authentication"
-msgstr "El servidor requiere autentificación"
+#: mail/mail-config.glade.h:76
+msgid "Server requires _authentication"
+msgstr "El servidor requiere _autenticación"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:77
 msgid "Signature file:"
 msgstr "Archivo de firma:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:78
 msgid "Source"
 msgstr "Fuente"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:79
 msgid "Source Information"
 msgstr "Información de la Fuente"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:80
 msgid "Sources"
 msgstr "Fuentes"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:81
 msgid "Special Folders"
 msgstr "Carpetas Especiales"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:82
 msgid "Standard Unix mbox"
 msgstr "Mabox estándar de Unix"
 
-#: mail/mail-config.glade.h:104
-msgid "Use secure connection (SSL)"
-msgstr "Use conexiones seguras (SSL)"
-
-#: mail/mail-config.glade.h:105
-msgid "Username:"
-msgstr "Nombre:"
+#: mail/mail-config.glade.h:84
+msgid "Use secure connection (_SSL)"
+msgstr "Use conexiones seguras (_SSL)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:85
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -7420,15 +7322,103 @@ msgstr ""
 "\n"
 "Pulse «Siguiente» para comenzar. "
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:89
+msgid "_Always load images off the net"
+msgstr "C_argar imagenes fuera de la red"
+
+#: mail/mail-config.glade.h:90
+msgid "_Automatically check for new mail every"
+msgstr "Comprobar el correo _automáticamente cada"
+
+#: mail/mail-config.glade.h:91
+msgid "_Check for supported types"
+msgstr "_Comprobar tipos soportados"
+
+#: mail/mail-config.glade.h:94
+msgid "_Email Address:"
+msgstr "Dir_ección de correo:"
+
+#: mail/mail-config.glade.h:95
+msgid "_Empty trash folders on exit"
+msgstr "Vaciar pap_elera al salir"
+
+#: mail/mail-config.glade.h:96
+msgid "_Full Name:"
+msgstr "_Nombre completo:"
+
+#: mail/mail-config.glade.h:97
+msgid "_HTML Signature:"
+msgstr "Firma en _HTML:"
+
+#: mail/mail-config.glade.h:98
+msgid "_Highlight citations with"
+msgstr "_Resaltadar citas con"
+
+#: mail/mail-config.glade.h:99
+msgid "_Host:"
+msgstr "_Servidor:"
+
+#: mail/mail-config.glade.h:100
+msgid "_Load images if sender is in addressbook"
+msgstr "Cargar imágenes si e_l remitente esta el la agenda de direcciones"
+
+#: mail/mail-config.glade.h:101
+msgid "_Log filter actions to:"
+msgstr "Registrar acciones de _los filtros en:"
+
+#: mail/mail-config.glade.h:102
+msgid "_Mark messages as Read after"
+msgstr "_Marcar mensajes como Leído tras"
+
+#: mail/mail-config.glade.h:103
+msgid "_Name:"
+msgstr "_Nombre:"
+
+#: mail/mail-config.glade.h:104
+msgid "_Never load images off the net"
+msgstr "_No cargar nunca imágenes desde la red"
+
+#: mail/mail-config.glade.h:105
+msgid "_Organization:"
+msgstr "_Organización:"
+
+#: mail/mail-config.glade.h:106
+msgid "_PGP binary path:"
+msgstr "Localización del binario de _PGP:"
+
+#: mail/mail-config.glade.h:107
+msgid "_Path:"
+msgstr "R_uta:"
+
+#: mail/mail-config.glade.h:108
+msgid "_Remember PGP Passphrase until exit"
+msgstr "_Recordar la frase de paso de PGP hasta salir del programa"
+
+#: mail/mail-config.glade.h:109
+msgid "_Remember this password"
+msgstr "_Recuerda esta contraseña"
+
+#: mail/mail-config.glade.h:110
+msgid "_Send mail in HTML format by default."
+msgstr "Enviar el men_saje en formato HTML de forma predeterminada"
+
+#: mail/mail-config.glade.h:111
+msgid "_Signature file:"
+msgstr "_Archivo de firma:"
+
+#: mail/mail-config.glade.h:112
+msgid "_Username:"
+msgstr "Nombre de _usuario:"
+
+#: mail/mail-config.glade.h:114
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "placeholder"
 msgstr "placeholder"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "seconds."
 msgstr "segundos."
 
@@ -7518,115 +7508,115 @@ msgstr "Guardar Enlaze como (ARREGLAME)"
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:146
 #, c-format
 msgid "%d new"
 msgstr "%d nuevos"
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:152 mail/mail-folder-cache.c:159
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:153
 #, c-format
 msgid "%d hidden"
 msgstr "%d ocultos"
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:162
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:164
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 msgid "Bad Address"
 msgstr "Dirección erronea"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1290
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "No hay programas GPG/PGP configurados."
 
-#: mail/mail-format.c:1306
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:1317
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1376
+#: mail/mail-format.c:1392
 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:1387
+#: mail/mail-format.c:1403
 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:2045
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2059
+#: mail/mail-format.c:2075
 #, 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:2064
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:2093
+#: mail/mail-format.c:2109
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2101
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
@@ -7684,6 +7674,11 @@ msgstr ""
 "Error mientras hacia:\n"
 "%s"
 
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Recuerda esta contraseña"
+
 #: mail/mail-mt.c:796
 msgid "Working"
 msgstr "Trabajando"
@@ -7696,100 +7691,100 @@ msgstr "Carpeta de filtrado"
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:590
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando «%s»"
 
-#: mail/mail-ops.c:710
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:731 mail/mail-send-recv.c:506
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:511
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:896
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:896
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:916
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1028
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en «%s»"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1068 mail/mail-ops.c:1069
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075
 msgid "Trash"
 msgstr "Papelera"
 
-#: mail/mail-ops.c:1201
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1242 mail/mail-ops.c:1380
+#: mail/mail-ops.c:1253 mail/mail-ops.c:1394
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1448
+#: mail/mail-ops.c:1460
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1580
+#: mail/mail-ops.c:1599
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1616
+#: mail/mail-ops.c:1635
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1684
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1734
+#: mail/mail-ops.c:1751
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1820
+#: mail/mail-ops.c:1837
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1899
+#: mail/mail-ops.c:1917
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7798,7 +7793,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1925
+#: mail/mail-ops.c:1943
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7807,11 +7802,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:2017
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2033
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7820,16 +7815,20 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2044
+#: mail/mail-ops.c:2062
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2113
+#: mail/mail-ops.c:2131
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Buscar"
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(Mansaje sin título)"
@@ -7866,19 +7865,19 @@ msgstr "Coincide:"
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "Enviar & Recibir mensajes"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:308 mail/mail-send-recv.c:359
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-send-recv.c:502
+#: mail/mail-send-recv.c:507
 msgid "Cancelled."
 msgstr "Cancelado"
 
@@ -7912,71 +7911,80 @@ msgstr "Carpetas virtuales"
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+msgid "(No subject)"
+msgstr "(Sin asunto)"
+
+#: mail/message-browser.c:127
+#, c-format
+msgid "%s - Message"
+msgstr "%s - Mensaje"
+
+#: mail/message-list.c:629
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:630
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:631
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:632
 msgid "Multiple Unseen Messages"
 msgstr "Multiples mensajes sin leer"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:633
 msgid "Multiple Messages"
 msgstr "Multiples mensajes"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:637
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:638
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:642
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:643
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:893
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:900
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:909
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:921
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:929
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:931
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2285
+#: mail/message-list.c:2312
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: mail/message-list.c:2297
+#: mail/message-list.c:2324
 msgid "Updating message list"
 msgstr "Actualizando la lista de mensajes"
 
@@ -7992,38 +8000,71 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Carpeta"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "Almacenar"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "Mostrar carpetas que comiencen por:"
+#: mail/subscribe-dialog.c:166
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Escaneando carpetas bajo %s en «%s»"
 
 #: mail/subscribe-dialog.c:168
 #, c-format
-msgid "Getting store for \"%s\""
-msgstr "Obteniendo sitio para «%s»"
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Escaneando carpetas de nivel superior en «%s»"
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:267
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Suscribiendo a carpeta «%s»"
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:269
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Dessuscribiendo la carpeta «%s»"
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1190 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "Carpeta"
+
+#: mail/subscribe-dialog.c:1432
+msgid "No server has been selected"
+msgstr "No se ha seleccionado ningún servidor"
+
+#: mail/subscribe-dialog.c:1489
+msgid "Please select a server."
+msgstr "Por favor seleccione un servidor."
+
+#: mail/subscribe-dialog.glade.h:1
+msgid " _Refresh List "
+msgstr "_Regenerar la lista "
+
+#: mail/subscribe-dialog.glade.h:2
+msgid "All folders"
+msgstr "Todas las carpetas"
+
+#: mail/subscribe-dialog.glade.h:3
+msgid "Display options"
+msgstr "Mostrar opciones"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr "Carpetas cuyo nombre comienze por:"
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "Administrar Suscripciones"
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr "Mostrar _carpetas del servidor:"
+
+#: mail/subscribe-dialog.glade.h:7
+msgid "_Subscribe"
+msgstr "_Suscribir"
+
+#: mail/subscribe-dialog.glade.h:8
+msgid "_Unsubscribe"
+msgstr "Dess_uscribir"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Componente Evolution para el resumen de trabajo."
@@ -8036,19 +8077,19 @@ 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:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 msgid "No appointments"
 msgstr "Sin citas"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 msgid "%l:%M%p"
 msgstr "%l:%M%p"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
@@ -8072,7 +8113,11 @@ msgstr "Añadir una fuente de noticias"
 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-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nombre:"
+
+#: my-evolution/e-summary-preferences.c:1403
 msgid "My Evolution Settings"
 msgstr "Configuración de Mi Evolution"
 
@@ -8084,7 +8129,7 @@ msgstr "Hubo un error descargando la fuente de noticias"
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Error obteniendo RDF</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
 msgstr "No hay tareas"
 
@@ -9299,108 +9344,124 @@ msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid "Add new feed"
-msgstr "Añadir fuente de noticias"
+msgid " _Remove"
+msgstr "Quita_r"
 
 #: my-evolution/my-evolution.glade.h:2
-msgid "All folders:"
-msgstr "Todas las carpetas:"
+msgid "Add n_ew feed"
+msgstr "Añadir nu_eva fuente"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr "Todas las fuentes de noticias:"
+msgid "Al_l stations:"
+msgstr "Todas _las estaciones:"
 
 #: my-evolution/my-evolution.glade.h:4
-msgid "All stations:"
-msgstr "Todas las estaciones"
+msgid "All _folders:"
+msgstr "_Todas las carpetas:"
+
+#: my-evolution/my-evolution.glade.h:5
+msgid "All news _feeds:"
+msgstr "Todas las _fuentes de noticias:"
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "Display folders:"
-msgstr "Mostrar carpetas:"
+#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1024
+msgid "Calendar"
+msgstr "Calendario"
 
 #: my-evolution/my-evolution.glade.h:7
-msgid "Display stations:"
-msgstr "Mostrar estaciones:"
+msgid "How many days should the calendar display at once?"
+msgstr "¿Cuantos mensajes debe mostrar de una vez el calendario?"
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "Displayed feeds:"
-msgstr ""
+msgid "Ma_x number of items shown:"
+msgstr "Número má_ximo de elementos mostrados:"
 
 #: my-evolution/my-evolution.glade.h:9
-msgid "Five days"
-msgstr "Cinco dias"
+msgid "News Feed Settings"
+msgstr "Configuración de las fuentes de noticias"
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr "¿Cuantos mensajes debe mostrar de una vez el calendario?"
+msgid "One mont_h"
+msgstr "Un _mes"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "One w_eek"
+msgstr "Una s_emana"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
-msgstr "Número máximo de elementos mostrados:"
+msgid "Refresh _time (seconds):"
+msgstr "_Tiempo de actualización (segundos):"
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "News Feed Settings"
-msgstr "Configuración de las fuentes de noticias"
+msgid "Show _all tasks"
+msgstr "Mostrar tod_as las tareas"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+msgid "Show _today's tasks"
+msgstr "Mostrar las _tareas de hoy"
 
 #: my-evolution/my-evolution.glade.h:15
-msgid "One day"
-msgstr "Un día"
+msgid "Tasks "
+msgstr "Tareas "
 
 #: my-evolution/my-evolution.glade.h:16
-msgid "One month"
-msgstr "Un mes"
+msgid "Units: "
+msgstr "Unidades: "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "One week"
-msgstr "Una semana"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Refresh time (seconds):"
-msgstr "Tiempo de actualización (segundos):"
+msgid "Weather settings"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Schedule"
-msgstr "Horario"
+msgid "_Display folders:"
+msgstr "_Mostrar carpetas:"
 
 #: my-evolution/my-evolution.glade.h:20
-msgid "Show all tasks"
-msgstr "Mostrar tadas las tareas"
+msgid "_Display stations:"
+msgstr "_Mostrar estaciones:"
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "Show full path for folders"
-msgstr "Mostrar ruta completa a las carpetas"
+msgid "_Displayed feeds:"
+msgstr "_Mostrar fuentes:"
 
 #: my-evolution/my-evolution.glade.h:22
-msgid "Show today's tasks"
-msgstr "Mostrar las tareas de hoy"
+msgid "_Five days"
+msgstr "_Cinco dias"
 
 #: my-evolution/my-evolution.glade.h:23
-msgid "Tasks "
-msgstr "Tareas "
+msgid "_Mail"
+msgstr "_Correo"
 
 #: my-evolution/my-evolution.glade.h:24
-msgid "Units: "
-msgstr "Unidades: "
+msgid "_News Feeds"
+msgstr "Fuentes de _noticias"
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "Weather"
-msgstr "Tiempo"
+msgid "_One day"
+msgstr "_Un día"
 
 #: my-evolution/my-evolution.glade.h:26
-msgid "Weather settings"
-msgstr ""
+msgid "_Refresh time (seconds):"
+msgstr "_Tiempo de actualización (segundos):"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "imperial"
-msgstr "anglosajón"
+msgid "_Schedule"
+msgstr "_Horario"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
-msgstr "métrico"
+msgid "_Show full path for folders"
+msgstr "Mo_strar ruta completa a las carpetas"
+
+#: my-evolution/my-evolution.glade.h:29
+msgid "_Weather"
+msgstr "_Tiempo"
+
+#: my-evolution/my-evolution.glade.h:30
+msgid "_imperial"
+msgstr "_anglosajón"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
+msgstr "m_étrico"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
@@ -9549,17 +9610,17 @@ msgstr "¿Esta seguro que quiere borrar la carpeta `%s'?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:450
+#: shell/e-shell-folder-commands.c:452
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Renombrar carpeta '%s'"
 
-#: shell/e-shell-folder-commands.c:454 shell/e-shortcuts-view.c:475
+#: shell/e-shell-folder-commands.c:456 shell/e-shortcuts-view.c:383
 msgid "Rename"
 msgstr "Renombrar"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:462
+#: shell/e-shell-folder-commands.c:464
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nombre de la carpeta:"
@@ -9577,7 +9638,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "El nombre de carpeta especificado no es valido."
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear nuevas carpetas"
 
@@ -9593,7 +9654,7 @@ msgstr ""
 msgid "New..."
 msgstr "Nuevo..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:514 shell/e-shell-folder-title-bar.c:515
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
@@ -9744,44 +9805,44 @@ msgid "Work Online"
 msgstr "Trabajar conectado"
 
 #: shell/e-shell-view-menu.c:715 shell/e-shell-view-menu.c:728
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:35
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:177
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrándose)"
 
-#: shell/e-shell-view.c:1380
+#: shell/e-shell-view.c:1385
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1382
+#: shell/e-shell-view.c:1387
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1420
+#: shell/e-shell-view.c:1425
 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:1427
+#: shell/e-shell-view.c:1432
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1433
+#: shell/e-shell-view.c:1438
 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:453
+#: shell/e-shell.c:491
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1347
+#: shell/e-shell.c:1405
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -9790,35 +9851,35 @@ msgstr ""
 "Ooops!  La vista `%s' ha cesado inesperadamente. :-(\n"
 "Esto probablemente significa que el componente %s se ha roto."
 
-#: shell/e-shell.c:1524 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1609 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1526
+#: shell/e-shell.c:1611
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:1528
+#: shell/e-shell.c:1613
 msgid "Cannot register on OAF"
 msgstr "No puedo registrarme en OAF"
 
-#: shell/e-shell.c:1530
+#: shell/e-shell.c:1615
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: shell/e-shell.c:1532 shell/e-storage.c:481
+#: shell/e-shell.c:1617 shell/e-storage.c:481
 msgid "Generic error"
 msgstr "Error genérico"
 
-#: shell/e-shortcuts-view.c:136
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:139
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "Nombre del grupo:"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9827,117 +9888,113 @@ msgstr ""
 "¿Realmente quiere quitar el grupo\n"
 "`%s' del menú de atajos?"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "No quitar"
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:204
 msgid "Rename Shortcut Group"
 msgstr "Renombrar Grupo de Atajos"
 
-#: shell/e-shortcuts-view.c:296
+#: shell/e-shortcuts-view.c:205
 msgid "Rename selected shortcut group to:"
 msgstr "Renombrar grupos de atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "Icono_s pequeños"
 
-#: shell/e-shortcuts-view.c:310
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "Mostrar los atajos como iconos pequeños"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "Iconos _grandes"
 
-#: shell/e-shortcuts-view.c:313
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar los atajos como iconos grandes"
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "_Nuevo grupo..."
 
-#: shell/e-shortcuts-view.c:325
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:236
 msgid "_Remove this Group..."
 msgstr "_Quitar este Grupo..."
 
-#: shell/e-shortcuts-view.c:328
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "Quitar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:239
 msgid "Re_name this Group..."
 msgstr "Re_nombrar este Grupo..."
 
-#: shell/e-shortcuts-view.c:331
+#: shell/e-shortcuts-view.c:240
 msgid "Rename this shortcut group"
 msgstr "Renombrar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:337
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:365
 msgid "Rename shortcut"
 msgstr "Renombrar atajo"
 
-#: shell/e-shortcuts-view.c:457
+#: shell/e-shortcuts-view.c:366
 msgid "Rename selected shortcut to:"
 msgstr "Renombrar atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:470 ui/evolution-message-composer.xml.h:15
-msgid "Open"
-msgstr "Abrir"
-
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:378
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir la carpeta enlazada a este atajo"
 
-#: shell/e-shortcuts-view.c:472 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Abrir en una nueva ventana"
 
-#: shell/e-shortcuts-view.c:472
+#: shell/e-shortcuts-view.c:380
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abrir la carpeta asociada a este atajo en una nueva ventana"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:383
 msgid "Rename this shortcut"
 msgstr "Renombrar este atajo"
 
-#: shell/e-shortcuts-view.c:477
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
-#: shell/e-shortcuts.c:609
+#: shell/e-shortcuts.c:620
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: shell/e-shortcuts.c:1008
+#: shell/e-shortcuts.c:1019
 msgid "Shortcuts"
 msgstr "Atajos"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: shell/e-shortcuts.c:1012
+#: shell/e-shortcuts.c:1023
 msgid "Inbox"
 msgstr "Inbox"
 
-#: shell/e-shortcuts.c:1015
+#: shell/e-shortcuts.c:1026
 msgid "Contacts"
 msgstr "Contactos"
 
-#: shell/e-storage-set-view.c:1482
+#: shell/e-storage-set-view.c:1464 shell/e-summary-storage.c:78
 msgid "My Evolution"
 msgstr "Mi Evolution"
 
@@ -9981,12 +10038,12 @@ msgstr "Operación no soportada"
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no esta soportado por este manejador"
 
-#: shell/e-task-widget.c:168
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:173
+#: shell/e-task-widget.c:175
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
@@ -10201,9 +10258,12 @@ msgstr "Parar"
 msgid "Stop Loading"
 msgstr "Parar la carga"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-messagedisplay.xml.h:7 ui/evolution-task-editor.xml.h:9
-#: ui/evolution.xml.h:40
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:29
+#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "A_cciones"
 
@@ -10216,11 +10276,11 @@ msgid "_Contact"
 msgstr "_Contacto"
 
 #: ui/evolution-addressbook.xml.h:33
-msgid "_Contact Group"
-msgstr "_Contactar con el Grupo"
+msgid "_Contact List"
+msgstr "Lista de _contactos"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:35
-#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:36
+#: ui/evolution-contact-editor.xml.h:16 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Im_primir..."
 
@@ -10236,8 +10296,9 @@ msgstr "Bu_scar contactos"
 msgid "_Select All"
 msgstr "_Seleccionar todo"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:37
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-messagedisplay.xml.h:8
 msgid "_Tools"
 msgstr "_Herramientas"
 
@@ -10329,23 +10390,23 @@ msgstr "Mostrar un semana laboral"
 msgid "W_ork Week"
 msgstr "Semana lab_oral"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:30
 msgid "_Appointment..."
 msgstr "Cit_a..."
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:31
 msgid "_Calendar Settings..."
 msgstr "_Configuración del calendario..."
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:33
 msgid "_Day"
 msgstr "_Día"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:34
 msgid "_Month"
 msgstr "_Mes"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:38
 msgid "_Week"
 msgstr "_Semana"
 
@@ -10365,8 +10426,8 @@ msgstr "Cerrar esta cita"
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Barra de herramientas principal"
 
@@ -10390,8 +10451,7 @@ msgstr "Imprimir este elemento"
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save and Close"
 msgstr "Guardar y cerrar"
 
@@ -10407,16 +10467,12 @@ msgstr "Guardar este elemento a disco"
 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
-msgid "_Action"
-msgstr "_Acción"
-
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:9
-#: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Archivo"
 
@@ -10433,8 +10489,15 @@ msgid "Print En_velope..."
 msgstr "Imprimir ca_becera..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:244
+msgid "Save"
+msgstr "Guardar"
+
+#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Guardar _como..."
 
@@ -10455,31 +10518,31 @@ msgstr "Ver la ayuda en línea"
 msgid "Send _message to contact..."
 msgstr "Enviar un _mensaje al contacto..."
 
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:56
+#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Borrar esta lista"
 
-#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete..."
 msgstr "Borrar..."
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Guardar la lista y cerrar la ventana de diálogo"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "E_nviar la lista a otros..."
 
 #
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Enviar un _mensaje a la lista..."
 
@@ -10560,35 +10623,31 @@ msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Olvidar las contraseñas recordadas con lo que será preguntado de nuevo"
 
 #: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "Administrar _suscripciones..."
-
-#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr "Abrir una ventana para escribir un mensaje de correo"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todos los mansajes borrados de todas las carpetas"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar el correo en la cola y obtener el nuevo"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr "Mostrar ventana de vista previa del mensajes"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Suscribirse o desuscribirse de carpetas de los servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
@@ -10612,6 +10671,10 @@ msgstr "Vista _previa"
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
+#: ui/evolution-mail-global.xml.h:24
+msgid "_Subscribe to Folders..."
+msgstr "_Suscribirse a las carpetas..."
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Cambiar las propiedades de esta carpeta"
@@ -10680,8 +10743,8 @@ msgid "Select all visible messages"
 msgstr "Seleccionar todos los mensajes visibles"
 
 #: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "Mostrar _todo"
+msgid "Sh_ow Hidden Messages"
+msgstr "M_ostrar mensajes ocultos"
 
 #: ui/evolution-mail-list.xml.h:21
 msgid "Show messages that have been temporarily hidden"
@@ -10699,23 +10762,23 @@ msgstr "Oculta temporalmente los mensajes seleccionados"
 msgid "Threaded Message list"
 msgstr "Lista de Mensajes Encadenados"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-list.xml.h:26
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:42
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Invertir selección"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
 msgstr "_Lista de Mensajes Encadenados"
 
@@ -11019,39 +11082,39 @@ msgstr "VFolder según los Destinata_rios..."
 msgid "VFolder on _Subject..."
 msgstr "VFolder según el A_sunto..."
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "_Aplicar filtro"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr "_Copiar a la Carpeta"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Forward Message"
 msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Move to Folder"
 msgstr "_Mover a la Carpeta"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Normal Display"
 msgstr "Vista _Normal"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Open Message"
 msgstr "_Abrir Mensaje"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Re-send Message"
 msgstr "_Reenviar Mensaje"
 
@@ -11059,28 +11122,15 @@ msgstr "_Reenviar Mensaje"
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
-msgid "Customi_ze Toolbars..."
-msgstr "Personali_zar barras de herramientas..."
-
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
-msgid "Customize"
-msgstr "Personalizar"
-
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:5 ui/evolution.xml.h:12
-msgid "Customize toolbars"
-msgstr "Personalizar barras de herramientas"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:37
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:58 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:54
 msgid "_View"
 msgstr "_Vista"
 
@@ -11092,195 +11142,186 @@ msgstr "Adjuntar"
 msgid "Close the current file"
 msgstr "Cerrar el archivo actual"
 
-#: ui/evolution-message-composer.xml.h:6
-msgid "Customize toolbars..."
-msgstr "Personalizar barras de herramientas..."
-
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Borrar todas menos la firma"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Encriptar este mensaje con PGP"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Encripta este mensaje con su Certificado de Encriptación S/MIME"
 
-#: ui/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormatear"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:10
 msgid "Inline Text _File..."
 msgstr "Archivo de texto en línea..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Insertar un archivo como texto en el mensaje"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Insertar un archivo de texto..."
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Encriptar con PGP"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "Encriptar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Firmar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
-msgid "Save"
-msgstr "Guardar"
-
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Guardar como"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Guardar _Borrador"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:24
 #: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Guardara el mensaje a una carpeta específica"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Enviar el mensaje más tarde"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Enviar este mensaje ahora"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Mostrar / ocultar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Mostrar _adjuntos"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Mostrar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con tu clave PGP"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Firmar este mensaje con su certificado de firma S/MIME"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Activa si se muestra el campo CCO"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Activa si se muestra el campo CC"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Activa si se muestra el selector 'De'"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Activa si se muestra el campo Responder-A"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Attachment..."
 msgstr "_Adjunto..."
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Campo Cc_o"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Depurar"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:57
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Seguridad"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:45
 msgid "_Help"
 msgstr "A_yuda"
 
@@ -11392,163 +11433,147 @@ msgstr "Crear un enlace a esta carpeta en la lista de atajos"
 msgid "Create a new folder"
 msgstr "Crear una nueva carpeta"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
 msgstr "Borrar esta carpeta"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "Mostrar una carpeta distinta"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr "_FAQ de Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "_Ventana de Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "Salir del programa"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:16
 msgid "Getting _Started"
 msgstr "Comenzando"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:17
 msgid "Import an external file format"
 msgstr "Importar un formato de archivo externo"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:19
 msgid "Move this folder to another place"
 msgstr "Mueve esta carpeta a otro sitio"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Abrir en una Nueva _Ventana"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Abre esta carpeta en una nueva ventana"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Mostrar información acerca de Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Enviar reporte de fallo"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un reporte de fallo usando Bug Buddy"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Activar"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Activar si se estamos trabajando desconectados o no."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:31
 msgid "Using the C_ontact Manager"
 msgstr "Usando el administrador de c_ontactos"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:32
 msgid "Using the _Calendar"
 msgstr "Usando el _calendario"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:33
 msgid "Using the _Mailer"
 msgstr "Usando el _correo"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:34
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:36
 msgid "_About Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "_Appointment (FIXME)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:43
 msgid "_Folder Bar"
 msgstr "Barra de _carpetas"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:44
 msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:46
 msgid "_Import file..."
 msgstr "_Importar archivo..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:47
 msgid "_Index"
 msgstr "_Índice"
 
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "_Enviar mensaje"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Nueva carpeta"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:51
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:52
 msgid "_Shortcut"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:53
 msgid "_Shortcut Bar"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "_Task (FIXME)"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:55
 msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
@@ -11599,10 +11624,6 @@ msgstr "Con categoría"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "Ocupado"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
@@ -11675,7 +11696,7 @@ msgstr "Todos los participantes"
 msgid "_Current View"
 msgstr "_Vista actual"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr "Definir Vistas"
 
@@ -11685,6 +11706,11 @@ msgstr "Definir Vistas"
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%B %Y"
+
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Ahora"
@@ -11775,26 +11801,26 @@ msgstr "Codificación de Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 msgid "Search Editor"
 msgstr "Editor de busquedas"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "Guardar búsqueda"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "Búqueda avanzada"
+#: widgets/misc/e-filter-bar.h:94
+msgid "Add to Saved Searches"
+msgstr "Añadir a la búsqueda guardada"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:95
+msgid "Clear"
+msgstr "Limpiar"
+
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Avanzado..."
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Información"
@@ -11820,10 +11846,14 @@ msgstr "Mensaje"
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:312
 msgid "Sear_ch"
 msgstr "Bus_car"
 
+#: widgets/misc/e-search-bar.c:407
+msgid "Find Now"
+msgstr "Buscar ahora"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "El Servidor de Agendas Personales"
@@ -11844,6 +11874,228 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#~ msgid "LDAP Server"
+#~ msgstr "Servidor LDAP"
+
+#~ msgid "File"
+#~ msgstr "Archivo"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Tipo de agenda de direcciones desconocido"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Ninguno (modo anónimo)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "Tipo de autentificación desconocido"
+
+#~ msgid "Subtree"
+#~ msgstr "Sub-arbol"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "Tipo de rango desconocido"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "FIXME Bind DN Help text here"
+
+#~ msgid "FIXME Host help text here."
+#~ msgstr "FIXME Host help text here."
+
+#~ msgid "Root DN:"
+#~ msgstr "DN raíz:"
+
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "FIXME Root DN help text here."
+
+#~ msgid "FIXME Port help text here."
+#~ msgstr "FIXME Port help text here."
+
+#~ msgid "Authentication:"
+#~ msgstr "Autentificación:"
+
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "Opciones avanzadas de LDAP"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "FIXME Path Help text here"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Crear ruta si no existe."
+
+#~ 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."
+
+#~ msgid "FIXME Name help text here"
+#~ msgstr "FIXME Name help text here"
+
+#~ msgid "FIXME Description help text here"
+#~ msgstr "FIXME Description help text here"
+
+#~ msgid "Addressbook Sources"
+#~ msgstr "Fuentes de la agenda de direcciones"
+
+#~ msgid "Name"
+#~ msgstr "Nombre"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Introduzca la contraseña para %s"
+
+#~ msgid "Category contains"
+#~ msgstr "La categría contiene"
+
+#~ msgid "Select name from _folder:"
+#~ msgstr "Seleccionar nombre de la _carpeta:"
+
+#~ msgid "%B"
+#~ msgstr "%B"
+
+#~ msgid "Transparent"
+#~ msgstr "Transparente"
+
+#~ msgid "Opaque"
+#~ msgstr "Opaco"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "La clasificación debe ser 'Pública', 'Privada', 'Confidencial' o 'Ninguna'"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "La transparencia debe ser 'Transparente', 'Opaca' o 'Ninguna'."
+
+#~ msgid "Colors for Tasks"
+#~ msgstr "Color para las Tareas"
+
+#~ msgid "Date Navigator"
+#~ msgstr "Navegador de Fechas"
+
+#~ msgid "Delegated From:"
+#~ msgstr "Delegado Por:"
+
+#~ msgid "No one"
+#~ msgstr "Ninguno"
+
+#~ msgid "Task"
+#~ msgstr "Tarea"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% Comp_leto:"
+
+#~ msgid "Transparency"
+#~ msgstr "Transparencia"
+
+#~ msgid "Birthday"
+#~ msgstr "Cumpleaños"
+
+#~ msgid "Competition"
+#~ msgstr "Competición"
+
+#~ msgid "Favorites"
+#~ msgstr "Favoritos"
+
+#~ msgid "Gifts"
+#~ msgstr "Regalos"
+
+#~ msgid "Goals/Objectives"
+#~ msgstr "Metas/Objetivos"
+
+#~ msgid "Holiday"
+#~ msgstr "Vacaciones"
+
+#~ msgid "Holiday Cards"
+#~ msgstr "Tarjetas de vacaciones"
+
+#~ msgid "Hot Contacts"
+#~ msgstr "Contactos interesantes"
+
+#~ msgid "Ideas"
+#~ msgstr "Ideas"
+
+#~ msgid "International"
+#~ msgstr "Internacional"
+
+#~ msgid "Key Customer"
+#~ msgstr "Cliente clave"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Miscelanea"
+
+#~ msgid "Personal"
+#~ msgstr "Personal"
+
+#~ msgid "Phone Calls"
+#~ msgstr "Llamadas de teléfono"
+
+#~ msgid "Strategies"
+#~ msgstr "Estrategias"
+
+#~ msgid "Suppliers"
+#~ msgstr "Suministradores"
+
+#~ msgid "Time & Expenses"
+#~ msgstr "Hora & Gastos"
+
+#~ msgid "VIP"
+#~ msgstr "VIP"
+
+#~ msgid "Waiting"
+#~ msgstr "Esperando"
+
+#~ msgid "Store search as vFolder"
+#~ msgstr "Guardar la búsqueda como una carpeta virtual"
+
+#~ msgid "Store"
+#~ msgstr "Almacenar"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "Mostrar carpetas que comiencen por:"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "Obteniendo sitio para «%s»"
+
+#~ msgid "_Contact Group"
+#~ msgstr "_Contactar con el Grupo"
+
+#~ msgid "_Action"
+#~ msgstr "_Acción"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Administrar _suscripciones..."
+
+#~ msgid "Show _All"
+#~ msgstr "Mostrar _todo"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Personali_zar barras de herramientas..."
+
+#~ msgid "Customize"
+#~ msgstr "Personalizar"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Personalizar barras de herramientas"
+
+#~ msgid "Customize toolbars..."
+#~ msgstr "Personalizar barras de herramientas..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Appointment (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#~ msgid "_Mail message"
+#~ msgstr "_Enviar mensaje"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Task (FIXME)"
+
 #~ msgid "Beep when alarm windows appear."
 #~ msgstr "Pitar cuando aparezca la ventana de la alarma."
author	Hector Garcia <hectorg@src.gnome.org>	2001-08-12 07:42:01 +0800
committer	Hector Garcia <hectorg@src.gnome.org>	2001-08-12 07:42:01 +0800
commit	d49b1127126e01b8cc50150b92a518db750eceec (patch)
tree	bd31bb2fdcd498b3bb00409f65fc99ba820ce014 /po
parent	0fd45526f9ade69b1209378015c3cd8e9848de49 (diff)
download	gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar.gz gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar.bz2 gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar.lz gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar.xz gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.tar.zst gsoc2013-evolution-d49b1127126e01b8cc50150b92a518db750eceec.zip