Updated Spanish translation

svn path=/trunk/; revision=17638

1 files changed, 1918 insertions, 1739 deletions

diff --git a/po/es.po b/po/es.po
index 6168a377e4..6835e890b4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
-"PO-Revision-Date: 2002-03-03 21:29+0100\n"
+"POT-Creation-Date: 2002-07-30 10:28+0200\n"
+"PO-Revision-Date: 2002-07-30 13:47+0200\n"
 "Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgstr "Archivar como"
 # src/file-manager/fm-list-view.c:1581
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nombre"
@@ -354,17 +354,17 @@ msgstr "VCard para %s"
 msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:356
 #: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Cargando..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Error buscando la expresión."
 
@@ -485,11 +485,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:624
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1073
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -505,24 +505,32 @@ msgstr "Servidor LDAP"
 msgid "LDAP server containing contact information"
 msgstr "El servidor LDAP contiene información de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:580
 msgid "New Contact List"
 msgstr "Nueva lista de contactos"
 
-#: addressbook/gui/component/addressbook-component.c:578
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:580
 msgid "Contact _List"
-msgstr "Lista de _contactos"
+msgstr "_Lista de contactos"
 
 #: addressbook/gui/component/addressbook-component.c:581
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Crear nueva lista de contactos"
+
+#: addressbook/gui/component/addressbook-component.c:584
 msgid "New Contact"
 msgstr "Nuevo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:584
 msgid "_Contact"
 msgstr "_Contacto"
 
+#: addressbook/gui/component/addressbook-component.c:585
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Crear nuevo contacto"
+
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
 msgid "Failed to connect to LDAP server"
@@ -544,30 +552,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "La respuesta del servidor IMAP no contenía información de %s"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "La respuesta del servidor IMAP no contenía información de %s"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL no está implementado en esta compilación de evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "No se puede inicializar gnome-vfs"
 
@@ -575,11 +583,11 @@ msgstr "No se puede inicializar gnome-vfs"
 msgid "Other Contacts"
 msgstr "Otros contactos"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -589,7 +597,7 @@ msgstr ""
 "que ha introducido una URI errónea, o que el servidor LDAP está\n"
 "caído"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -601,7 +609,7 @@ msgstr ""
 "de las fuentes del CVS una vez que haya obtenido LDAP del\n"
 "siguiente enlace.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -609,44 +617,44 @@ 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:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduzca la contraseña para %s (usuario %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "finaliza con"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "Correo electrónico 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categoría es"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Avanzado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrará el visor de carpetas"
 
@@ -710,18 +718,16 @@ msgid "Enable Queries (Dangerous!)"
 msgstr "Habilitar Consultas (¡Peligroso!)"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#, fuzzy
 msgid "  S_how Supported Bases "
-msgstr "_Comprobar tipos soportados "
+msgstr "Mo_strar bases soportadas "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1234"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
 msgid "1:00"
-msgstr "100"
+msgstr "1:00"
 
 #: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
@@ -732,9 +738,8 @@ msgid "3268"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-#, fuzzy
 msgid "380"
-msgstr "389"
+msgstr "380"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
@@ -753,14 +758,12 @@ msgid "666"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
 msgid "<- _Remove"
-msgstr "_Quitar"
+msgstr "<- _Quitar"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
 msgid "<< Fewer Options"
-msgstr "Opciones"
+msgstr "<< Menos Opciones"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
@@ -772,14 +775,12 @@ msgstr "Fuentes de la agenda de direcciones"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
 #: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Always"
-msgstr "Alarmas"
+msgstr "Siempre"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
-#, fuzzy
 msgid "Anonymously"
-msgstr "Anónimo"
+msgstr "Anónimamente"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Associated LDAP Attribute"
@@ -787,7 +788,7 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Attribute"
-msgstr ""
+msgstr "Atributo"
 
 #: addressbook/gui/component/ldap-config.glade.h:19
 msgid ""
@@ -799,18 +800,16 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:23
-#, fuzzy
 msgid "Connecting"
-msgstr "Conectica"
+msgstr "Conectando"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Corresponding Evolution Attribute"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
 msgid "DN Customization"
-msgstr "Sin información"
+msgstr "Personalización de DN"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
@@ -871,7 +870,7 @@ msgid "Mappings"
 msgstr "Márgenes"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_cada"
@@ -882,8 +881,8 @@ msgid ""
 "(Secure Sockets Layer)\n"
 "and TLS (Transport Layer Security) protocols are used by some servers to "
 "cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses "
-"these protocols."
+"your connection. Ask your system administrator if your LDAP server uses these "
+"protocols."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:41
@@ -925,8 +924,8 @@ msgstr "Rango de bú_squeda: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Buscando"
 
@@ -1011,18 +1010,17 @@ msgstr "Schema no soportado"
 
 #: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
+"The first step in configuring an LDAP server is to provide its name, and your "
+"log in\n"
 "information. Please ask your system administrator if you are unsure of this "
 "information."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
-"The options on this page control how many entries should be included in "
-"your\n"
-"searches, and how long a search should take. Ask your system administrator "
-"if you\n"
+"The options on this page control how many entries should be included in your\n"
+"searches, and how long a search should take. Ask your system administrator if "
+"you\n"
 "need to change these options."
 msgstr ""
 
@@ -1038,8 +1036,8 @@ msgstr ""
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
+"directory tree. A search scope of \"sub\" will include all entries below your "
+"search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
 "your base."
 msgstr ""
@@ -1056,25 +1054,23 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
+"This is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
-"too large will slow down your addressbook."
+"This is the maximum number of entries to download. Setting this number to be "
+"\ntoo large will slow down your addressbook."
 msgstr ""
 "Este es el máximo número de tarjetas a descargar.  Si pone este número "
 "demasiado alto relentizará su agenda."
 
 #: addressbook/gui/component/ldap-config.glade.h:90
 msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
+"This is the method evolution will use to authenticate you.  Note that setting "
+"this to \"Email Address\" requires anonymous access to your ldap server."
 msgstr ""
 "Este es el método que usará evolution para autenticarse.  Note que "
 "configurarlo como \"Dirección de Correo\" requiere acceso anónimo a su "
@@ -1092,9 +1088,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"\nlist of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
 
@@ -1122,12 +1117,11 @@ msgid "Using distinguished name (DN)"
 msgstr "Distinguido"
 
 #: addressbook/gui/component/ldap-config.glade.h:102
-#, fuzzy
 msgid "Using email address"
-msgstr "Dirección de correo:"
+msgstr "Usando dirección de correo"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1135,14 +1129,13 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Añadir"
 
 #: addressbook/gui/component/ldap-config.glade.h:105
-#, fuzzy
 msgid "_Add ->"
-msgstr "_Añadir"
+msgstr "_Añadir ->"
 
 #: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
@@ -1165,9 +1158,8 @@ msgid "_Delete Mapping"
 msgstr "_Borrar todo"
 
 #: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
 msgid "_Display name:"
-msgstr "_Mostrar"
+msgstr "_Mostrar nombre:"
 
 # src/nautilus-first-time-druid.c:290
 #: addressbook/gui/component/ldap-config.glade.h:111
@@ -1180,18 +1172,17 @@ msgid "_Don't use SSL/TLS"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
 msgid "_Download limit:"
-msgstr "Descargar"
+msgstr "Límite de _descarga:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-undo-signal-handlers.c:174
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Editar"
@@ -1202,9 +1193,8 @@ msgid "_Edit Mapping"
 msgstr "_Editar cita"
 
 #: addressbook/gui/component/ldap-config.glade.h:116
-#, fuzzy
 msgid "_Evolution attribute:"
-msgstr "Alarma de Evolution"
+msgstr "Atributo de _Evolution:"
 
 #: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_If necessary "
@@ -1252,19 +1242,16 @@ msgid "_Timeout (minutes):"
 msgstr "Tiempo de recordatorio (minutos)"
 
 #: addressbook/gui/component/ldap-config.glade.h:127
-#, fuzzy
 msgid "account-druid"
-msgstr "Cuenta %d"
+msgstr "ayudante-de-cuentas"
 
 #: addressbook/gui/component/ldap-config.glade.h:128
-#, fuzzy
 msgid "account-editor"
-msgstr "editor-de-listas-de-contactos"
+msgstr "editor-de-cuentas"
 
 #: addressbook/gui/component/ldap-config.glade.h:129
-#, fuzzy
 msgid "cards"
-msgstr "Sin tarjetas"
+msgstr "tarjetas"
 
 #: addressbook/gui/component/ldap-config.glade.h:130
 #, fuzzy
@@ -1309,10 +1296,10 @@ msgstr "Factoría para la interfaz de selección de nombre de la Agenda"
 # src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:521 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1341,42 +1328,15 @@ msgstr "(%d no mostrado)"
 msgid "Unnamed Contact"
 msgstr "Contactos sin nombre"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:510
+msgid "Select Contacts from Addressbook"
+msgstr "Seleccionas contactos de la agenda"
+
+#: addressbook/gui/component/select-names/e-select-names.c:547
 #, fuzzy
 msgid "Find contact in"
 msgstr "El remitente contiene"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution no puede obtener la agenda local. Esto se puede deber a que haya "
-"fallado el componente evolution-addressbook. Para ayudarnos a entender mejor "
-"y finalmente resolver el problema, por favor envíe un mensaje a Jon "
-"Trowbridge <trow@ximian.com> con una descripción detallada de las "
-"circunstancias bajo las que ocurrió este error.  Gracias."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution no puede obtener la agenda de direcciones local.\n"
-"Bajo circunstancias normales, esto no debería pasar nunca.\n"
-"Puede que necesites salir y reiniciar Evolution para arreglar\n"
-"este problema."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Seleccionas contactos de la agenda"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "_Seleccionar nombres"
@@ -1387,9 +1347,8 @@ msgid "Selected Contacts:"
 msgstr "¿Borrar contacto?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
 msgid "Show Contacts"
-msgstr "Contactos"
+msgstr "Mostar contactos"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid ""
@@ -1398,15 +1357,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Mover..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categoría:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Carpeta:"
 
@@ -1512,11 +1466,12 @@ msgstr "Prefiere recibir el correo como _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3644
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:8
+#: mail/folder-browser.c:1725 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -2444,9 +2399,8 @@ msgid "Tajikistan"
 msgstr "Tajikistan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#, fuzzy
 msgid "Tanzania, United Republic Of"
-msgstr "República Unida de Tanzania"
+msgstr "Tanzania; República Unida de"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
@@ -2535,14 +2489,12 @@ msgid "Viet Nam"
 msgstr "Vietnam"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#, fuzzy
 msgid "Virgin Islands, British"
-msgstr "Islas Vírgenes Americanas"
+msgstr "Islas Vírgenes, Británicas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#, fuzzy
 msgid "Virgin Islands, U.S."
-msgstr "Islas Vírgenes Americanas"
+msgstr "Islas Vírgenes, U.S."
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Wallis And Futuna Islands"
@@ -2818,7 +2770,7 @@ msgstr ""
 "ya existen en esta carpeta.  ¿Quiere añadirlo de todos modos?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
@@ -2856,15 +2808,15 @@ msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1084
 msgid "Success"
 msgstr "Éxito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1123
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2872,8 +2824,8 @@ msgstr "Error desconocido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1114
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2890,7 +2842,7 @@ msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2899,12 +2851,10 @@ msgid "Cancelled"
 msgstr "Cancelar"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
-#, fuzzy
 msgid "Authentication Failed"
-msgstr "Fallo en la autenticación."
+msgstr "Fallo en la autenticación"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:44
-#, fuzzy
 msgid "Authentication Required"
 msgstr "Autenticación requerida"
 
@@ -3050,7 +3000,7 @@ msgstr "Agenda de direcciones"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Guardar como VCard"
 
@@ -3080,9 +3030,8 @@ msgid "Search for Contacts..."
 msgstr "Bu_scar contactos"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:885
-#, fuzzy
 msgid "Addressbook Sources..."
-msgstr "Fuentes de la _Agenda..."
+msgstr "Fuentes de la Agenda..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
@@ -3090,7 +3039,7 @@ msgid "Pilot Settings..."
 msgstr "_Configuración del pilot..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenviar contacto"
 
@@ -3100,8 +3049,8 @@ msgid "Send Message to Contact"
 msgstr "Enviar un mensaje al contacto"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
@@ -3111,9 +3060,8 @@ msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:899
-#, fuzzy
 msgid "Copy to folder..."
-msgstr "_Copiar a la carpeta..."
+msgstr "Copiar a la carpeta..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
@@ -3121,7 +3069,7 @@ msgid "Move to folder..."
 msgstr "_Mover a la carpeta..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
@@ -3132,22 +3080,22 @@ msgid "Copy"
 msgstr "Copiar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Pegar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: 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:20
 msgid "Delete"
 msgstr "Suprimir"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3602 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista actual"
@@ -3314,7 +3262,7 @@ msgstr "Márgenes"
 msgid "Number of columns:"
 msgstr "Número de columnas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Opciones"
 
@@ -3408,26 +3356,26 @@ msgstr "Cita sin título"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:734
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:733
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:732
 msgid "Low"
 msgstr "Baja"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Sin definir"
@@ -3460,9 +3408,8 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Un control bonobo de ejemplo que muestra un calendario."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
 msgid "Calendar and Tasks"
-msgstr "Configuración del calendario y de las tareas"
+msgstr "Calendario y tareas"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 #, fuzzy
@@ -3549,11 +3496,11 @@ msgstr "Tiempo de recordatorio (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:674
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:734
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3565,13 +3512,13 @@ msgstr ""
 "configurado para enviar un mensaje de correo.  En su lugar\n"
 "Evolution mostrará un diálogo de recordatorio normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:752
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2710
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:757
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3588,7 +3535,7 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:771
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
@@ -3616,7 +3563,7 @@ msgstr "La descripción contiene"
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1098
 msgid "Unmatched"
 msgstr "No coincidente"
 
@@ -3627,7 +3574,7 @@ 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:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
@@ -3654,12 +3601,12 @@ 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:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:975
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
@@ -3684,37 +3631,37 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1137
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1108
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Sin comenzar"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En proceso"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Completado"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1039
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3725,56 +3672,56 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1179 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2003
+#: mail/folder-browser.c:1687 mail/mail-account-gui.c:1228
+#: mail/mail-account-gui.c:1646 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: mail/message-tag-followup.c:67
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1707
 msgid "Recurring"
 msgstr "Recurriendo"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1709
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
 #: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:314
 #: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "No"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Vista Diaria"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Vista de la Semana Laboral"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Vista Semanal"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Vista Mensual"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1065
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3784,10 +3731,10 @@ msgstr "Carpeta conteniendo citas y eventos"
 
 #: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1069
 msgid "Tasks"
 msgstr "Tareas"
 
@@ -3795,40 +3742,57 @@ msgstr "Tareas"
 msgid "Folder containing to-do items"
 msgstr "Carpeta que contiene elementos por hacer"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:706
 msgid "New meeting"
 msgstr "Nueva reunión"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:706
 msgid "_Meeting"
 msgstr "_Reunión"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Crear una nueva tarea"
+
+#: calendar/gui/component-factory.c:711
 msgid "New task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:711
 msgid "_Task"
 msgstr "_Tarea"
 
 #: calendar/gui/component-factory.c:712
+msgid "Create a new task"
+msgstr "Crear una nueva tarea"
+
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:712
-#, fuzzy
+#: calendar/gui/component-factory.c:716
 msgid "All _Day Appointment"
-msgstr "Cit_a"
+msgstr "Cita de todo el _día"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:717
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Crear una nueva cita"
+
+#: calendar/gui/component-factory.c:721
 msgid "New appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:721
 msgid "_Appointment"
 msgstr "Cit_a"
 
+#: calendar/gui/component-factory.c:722
+msgid "Create a new appointment"
+msgstr "Crear una nueva cita"
+
 #: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
@@ -3888,15 +3852,14 @@ msgid ""
 "This is an email reminder, but Evolution does not yet support this kind of "
 "reminders.  You will not be able to edit the options for this reminder."
 msgstr ""
-"Este es un recordatorio por correo, pero Evolution todavía no implementa "
-"esta clase de recordatorios.  No podrá editar las opciones de este "
-"recordatorio."
+"Este es un recordatorio por correo, pero Evolution todavía no implementa esta "
+"clase de recordatorios.  No podrá editar las opciones de este recordatorio."
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Con estos argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:84
 msgid "days"
 msgstr "días"
 
@@ -3904,11 +3867,11 @@ msgstr "días"
 msgid "extra times every"
 msgstr "extra tiempo cada"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:85
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:86
 msgid "minutes"
 msgstr "minutos"
 
@@ -4036,7 +3999,7 @@ msgstr "Recordatorios"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4065,7 +4028,7 @@ msgstr "fin de la cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4094,9 +4057,8 @@ msgid "60 minutes"
 msgstr "60 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
-#, fuzzy
 msgid "Alerts"
-msgstr "Alberta"
+msgstr "Albertas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
@@ -4169,9 +4131,8 @@ msgid "T_hu"
 msgstr "Ju_e"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
 msgid "Task List"
-msgstr "Lista de _Tareas"
+msgstr "Lista de Tareas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1124
@@ -4230,9 +4191,8 @@ msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#, fuzzy
 msgid "_Day begins:"
-msgstr "La tarea empieza: <b>"
+msgstr "El _día comienza:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
@@ -4243,7 +4203,7 @@ msgid "_Fri"
 msgstr "_Vier"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_General"
 
@@ -4289,19 +4249,33 @@ msgstr "M_ier"
 msgid "before every appointment"
 msgstr "antes de comenzar la cita"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "El estado de la reunión a cambiado. ¿Enviar una versión actualizada?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "¿Esta seguro que quiere cancelar y borrar este encuentro?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "¿Esta seguro que quiere cancelar y borrar esta tarea?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "¿Esta seguro que quiere cancelar y borrar esta entrada del diario?"
 
@@ -4370,61 +4344,61 @@ msgstr " (Falta "
 msgid "Due "
 msgstr "Falta "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "¡No pude actualizar el objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "¡No pude actualizar el objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1204
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3857
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1149
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1305
+#: calendar/gui/dialogs/comp-editor.c:1329
+#: calendar/gui/dialogs/comp-editor.c:1353
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1380
 msgid "Unable to obtain current version!"
 msgstr "¡Imposible obtener versión actual!"
 
@@ -4623,7 +4597,7 @@ msgid "Member"
 msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4637,7 +4611,7 @@ msgstr "Papel"
 # libnautilus-private/nautilus-program-chooser.c:1199
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4670,21 +4644,18 @@ msgstr "_Invitar a otros..."
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
-#, fuzzy
 msgid "st"
-msgstr "1"
+msgstr "º"
 
 #: calendar/gui/dialogs/recurrence-page.c:127
 #: calendar/gui/dialogs/recurrence-page.c:147
-#, fuzzy
 msgid "nd"
-msgstr "2"
+msgstr "º"
 
 #: calendar/gui/dialogs/recurrence-page.c:128
 #: calendar/gui/dialogs/recurrence-page.c:148
-#, fuzzy
 msgid "rd"
-msgstr "3"
+msgstr "º"
 
 #: calendar/gui/dialogs/recurrence-page.c:129
 #: calendar/gui/dialogs/recurrence-page.c:130
@@ -4722,37 +4693,33 @@ msgid "on"
 msgstr "en"
 
 #: calendar/gui/dialogs/recurrence-page.c:1062
-#, fuzzy
 msgid "first"
-msgstr "lista"
+msgstr "primero"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:87
 msgid "second"
 msgstr "segundo"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1560
 #: calendar/gui/dialogs/recurrence-page.c:1064
-#, fuzzy
 msgid "third"
-msgstr "Otro"
+msgstr "tercero"
 
 #: calendar/gui/dialogs/recurrence-page.c:1065
-#, fuzzy
 msgid "fourth"
-msgstr "Norte"
+msgstr "cuarto"
 
 #: calendar/gui/dialogs/recurrence-page.c:1066
-#, fuzzy
 msgid "last"
-msgstr "lista"
+msgstr "último"
 
 #: calendar/gui/dialogs/recurrence-page.c:1092
 #, fuzzy
 msgid "Other Date"
 msgstr "Otro fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:84
 msgid "day"
 msgstr "día"
 
@@ -4852,20 +4819,26 @@ msgstr "% Completo"
 msgid "Date Completed:"
 msgstr "Fecha Completada:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
+msgid "Needs Action"
+msgstr "Necesita acción"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Progreso"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 #: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioridad:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "E_stado:"
 
@@ -4881,7 +4854,7 @@ msgstr "Básico"
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4950,82 +4923,81 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2758
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2114
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3626
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1698
+#: shell/e-shortcuts-view.c:389 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:985
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
-msgstr "Guardar como..."
+msgstr "_Guardar como..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3628
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3511 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:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3634
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3597
+#: calendar/gui/e-day-view.c:3635 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Asignar tarea"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Marcar como completo"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7497
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
@@ -5034,8 +5006,8 @@ msgstr "Pulse para añadir una tarea"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Completo"
 
@@ -5063,11 +5035,9 @@ msgstr "Prioridad"
 msgid "Start Date"
 msgstr "Fecha de Inicio"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1057
 msgid "Summary"
 msgstr "Resumen"
 
@@ -5109,111 +5079,109 @@ msgstr "%02i divisiones 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3581
 msgid "New _Appointment"
 msgstr "Nueva cit_a"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3583 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el día"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3585 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nueva reunión"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3587 calendar/gui/e-week-view.c:3474
 #, fuzzy
 msgid "New Task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3592 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3604 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3606 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la información de disponibilidad"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
-#, fuzzy
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
-msgstr "Configurar"
+msgstr "_Configurar..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3618 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Configurar"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3627 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1700 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3639 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Concertar un _encuentro"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3646 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3647 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4009 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Las utilidades GNOME Pilot no aparecen instaladas en este sistema."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4015 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Error ejecutando %s."
@@ -5254,7 +5222,7 @@ msgstr "Tarea completada: <b>"
 msgid "Task Due: <b>"
 msgstr "Plazo para la tarea: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Información del calendario"
 
@@ -5263,12 +5231,12 @@ msgstr "Información del calendario"
 msgid "iCalendar Error"
 msgstr "Error de calendario"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5276,27 +5244,32 @@ msgstr ""
 "<br> Por favor revise la siguiente información, y seleccione una acción del "
 "menú de abajo."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Ninguna<i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "L_ocalización:"
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
 #: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
 #: calendar/gui/itip-utils.c:382
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:385
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Aceptar tentativamente"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
 #: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
 #: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
 msgid "Declined"
@@ -5304,302 +5277,302 @@ msgstr "Rechazado"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-file.c:2936
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1230 calendar/gui/e-meeting-model.c:258
 #: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
 #: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
+#: mail/mail-display.c:849 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Aceptar tentativamente"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Enviar última información"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1086 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1124
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado información de reuniones."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1125
 msgid "Meeting Information"
 msgstr "Información  de reuniones"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> solicita su presencia en una reunión."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1134
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reunión existente."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1135
 msgid "Meeting Update"
 msgstr "Actualización de la reunión"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1139
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la última actualización de la reunión."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1140
 msgid "Meeting Update Request"
 msgstr "Petición de actualización de la reunión"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1163
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ha contestado a la petición de reunión."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1164
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha cancelado una reunión."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1169
 msgid "Meeting Cancellation"
 msgstr "Cancelación de reunión"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1281
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1174
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1196
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ha publicado la información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1197
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1201
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> te pide que realices una tarea."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1202
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea añadir a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1207
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quiere recibir la última información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Update Request"
 msgstr "Petición de actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ha contestado a una asignación de tarea."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1237
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1241
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1242
 msgid "Task Cancellation"
 msgstr "Cancelación de tarea"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1247
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ha publicado la información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1267
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pide su información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1272
 msgid "Free/Busy Request"
 msgstr "Petición de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1276
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ha contestado a una petición de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1277
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1282
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1361
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "La carpeta parece estar corrompida e irrecuperable."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1380
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje solo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1408 calendar/gui/e-itip-control.c:1414
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un calendario de mensaje válido"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1439
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1574 calendar/gui/e-itip-control.c:1666
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1577 calendar/gui/e-itip-control.c:1669
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Lo siento, pero hubo un error al leer %s."
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1580 calendar/gui/e-itip-control.c:1672
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "¡El elemento no puedo ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1675
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1586
 msgid "Update complete\n"
 msgstr "Actualización completada\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1589
 msgid "Calendar file could not be updated!\n"
 msgstr "¡El archivo del calendario no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1618 calendar/gui/e-itip-control.c:1684
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1639
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1651
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "¡El estado de asistencia no pudo ser actualizado a causa de un estado "
 "inválido!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1678
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1681
 msgid "Attendee status could not be updated!\n"
 msgstr "¡El estado de asistencia no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1716
 msgid "Removal Complete"
 msgstr "Borrado completo"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1746 calendar/gui/e-itip-control.c:1796
 msgid "Item sent!\n"
 msgstr "¡Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1748 calendar/gui/e-itip-control.c:1800
 msgid "The item could not be sent!\n"
 msgstr "¡El elemento no puedo ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccionar carpeta"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1910
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccionar carpeta"
@@ -5697,11 +5670,6 @@ msgstr "Participantes opcional"
 msgid "Non-Participant"
 msgstr "No participan"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Necesita acción"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 #: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
@@ -5819,9 +5787,8 @@ msgid "You don't have permission to open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
 #: calendar/gui/e-tasks.c:558
-#, fuzzy
 msgid "Completing tasks..."
-msgstr "Fecha de vencimiento"
+msgstr "Completando tareas..."
 
 #: calendar/gui/e-tasks.c:581
 #, fuzzy
@@ -5833,14 +5800,10 @@ msgstr "Borrando los objetos seleccionados"
 msgid "Expunging"
 msgstr "Comprimiendo carpeta"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Nueva cit_a..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Borrar esta cita"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5941,9 +5904,8 @@ msgid "Calendar information"
 msgstr "Información del calendario"
 
 #: calendar/gui/itip-utils.c:398
-#, fuzzy
 msgid "Updated"
-msgstr "Actualizar"
+msgstr "Actualizado"
 
 #: calendar/gui/itip-utils.c:406
 #, fuzzy
@@ -5958,7 +5920,12 @@ msgstr ""
 msgid "You must be an attendee of the event."
 msgstr "Debes participar en el evento."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "No se puede inicializar Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "No pude crear la factoría del componente editor"
 
@@ -6185,9 +6152,8 @@ msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2998
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -6222,8 +6188,8 @@ msgstr ""
 "\n"
 "¿Borrar realmente esos mensajes?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2482
+#: mail/mail-callbacks.c:2724
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
@@ -6249,8 +6215,8 @@ msgid ""
 msgstr ""
 "Evolution ha intentado tomar las tareas que estaban en su carpeta de "
 "calendario y migrarlas automáticamente a la nueva carpeta de tareas.\n"
-"Algunas tareas no han podido ser migradas, así que este proceso puede que "
-"sea reintentado otra vez en el futuro."
+"Algunas tareas no han podido ser migradas, así que este proceso puede que sea "
+"reintentado otra vez en el futuro."
 
 #: calendar/gui/tasks-migrate.c:120
 #, c-format
@@ -6258,14 +6224,14 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"No pude abrir `%s'; no se migrarán elementos de la carpeta de calendario a "
-"la carpeta de tareas."
+"No pude abrir `%s'; no se migrarán elementos de la carpeta de calendario a la "
+"carpeta de tareas."
 
 #: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
+"The method required to load `%s' is not supported; no items from the calendar "
+"folder will be migrated to the tasks folder."
 msgstr ""
 "El método requerido para cargar `%s' no está implementado. No se migrarán "
 "elementos de la carpeta de calendario a la carpeta de tareas."
@@ -6289,17 +6255,28 @@ msgstr "Importa archivos VCard a Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa archivos VCard a Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"No puedo obtener el mensaje; %s de la carpeta %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "No puedo conectar con el almacén: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Recordatorio"
 
-#: calendar/importers/icalendar-importer.c:638
-#, fuzzy
+#: calendar/importers/icalendar-importer.c:696
 msgid "Calendar Events"
-msgstr "Mensaje del Calendario"
+msgstr "Eventos de calendario"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6308,7 +6285,7 @@ msgstr ""
 "Evolution ha encontrado archivos de correo de Pine.\n"
 "¿Quiere importarlos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Agenda"
@@ -6388,8 +6365,8 @@ msgstr "contains? espera que el argumento 2 sea una cadena"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
 msgstr ""
 "contains? espera que el argumento 1 sea «any», «summary» ó «description»"
 
@@ -6402,8 +6379,8 @@ msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
-"has-categories? espera que todos los argumentos sean cadenas o que uno y "
-"solo un argumento sea un booleano falso (#f)"
+"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:835
 msgid "is-completed? expects 0 arguments"
@@ -7320,7 +7297,6 @@ msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
 #: calendar/zones.h:230
-#, fuzzy
 msgid "Asia/Macau"
 msgstr "Asia/Macao"
 
@@ -7329,9 +7305,8 @@ msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
 #: calendar/zones.h:232
-#, fuzzy
 msgid "Asia/Makassar"
-msgstr "Asia/Magadan"
+msgstr "Asia/Makassar"
 
 #: calendar/zones.h:233
 msgid "Asia/Manila"
@@ -7354,9 +7329,8 @@ msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
 #: calendar/zones.h:238
-#, fuzzy
 msgid "Asia/Oral"
-msgstr "Asia/Kabul"
+msgstr "Asia/Oral"
 
 #: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
@@ -7375,9 +7349,8 @@ msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
 #: calendar/zones.h:243
-#, fuzzy
 msgid "Asia/Qyzylorda"
-msgstr "Asia/Gaza"
+msgstr "Asia/Qyzylorda"
 
 #: calendar/zones.h:244
 msgid "Asia/Rangoon"
@@ -8016,72 +7989,82 @@ msgstr "Guardando carpeta '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en línea para completar esta operación"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "No pude abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "No pude procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "No puedo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Error al decodificar el mensaje."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Argumentos inválidos"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Argumentos inválidos"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Error al cachear el mensaje %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Error al cachear el mensaje %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
@@ -8133,11 +8116,10 @@ msgid "Moving messages"
 msgstr "Moviendo mensajes"
 
 #: camel/camel-folder.c:1317
-#, fuzzy
 msgid "Copying messages"
-msgstr "Copiando mensajes a %s"
+msgstr "Copiando mensajes"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8145,47 +8127,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Cancelado"
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Respuesta inesperada del servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "No ha especificado un nombre de archivo."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "No puedo cifrar este mensaje: no hay destinatarios."
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8193,18 +8175,18 @@ msgid ""
 "%.*s"
 msgstr "Error al cachear el mensaje %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Error al cachear el mensaje %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Error al decodificar el mensaje."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "No puedo verificar este mensaje: no pude crear archivo temporal: %s"
@@ -8230,22 +8212,22 @@ msgid "Could not lock '%s'"
 msgstr "No puedo bloquear '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "No pude bloquear el archivo para %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Dio un timeout tratando de cerrar el archivo %s. Inténtelo más tarde."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Fallo al hacer un lock usando fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fallo al hacer un lock usando flock(2): %s"
@@ -8304,11 +8286,15 @@ msgstr "Error escribiendo en el archivo temporal de correo: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Error copiando el correo al archivo temporal: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8385,8 +8371,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Esta opción conectará con el servidor usando una clave segura CRAM-MD5, si "
-"el servidor lo implementa."
+"Esta opción conectará con el servidor usando una clave segura CRAM-MD5, si el "
+"servidor lo implementa."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -8394,8 +8380,8 @@ msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:45
 msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
+"This option will connect to the server using a secure DIGEST-MD5 password, if "
+"the server supports it."
 msgstr ""
 "Esta opción conectará con el servidor usando una clave segura DIGEST-MD5, si "
 "el servidor lo implementa."
@@ -8431,7 +8417,8 @@ msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:42
-msgid "This option will connect to the server using Kerberos 4 authentication."
+msgid ""
+"This option will connect to the server using Kerberos 4 authentication."
 msgstr "Esta opción conectará con el servidor usando autenticación Kerberos 4."
 
 #: camel/camel-sasl-kerberos4.c:161
@@ -8444,7 +8431,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:847
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
@@ -8657,9 +8644,8 @@ msgid "GOOD"
 msgstr ""
 
 #: camel/camel-tcp-stream-ssl.c:501
-#, fuzzy
 msgid "BAD"
-msgstr "AND"
+msgstr "BAD"
 
 #. construct our user prompt
 #: camel/camel-tcp-stream-ssl.c:504
@@ -8682,32 +8668,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "No pude analizar la URL `%s'"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Error cargando %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No existe el mensaje %s en %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No puedo borrar la carpeta: %s: Operación no válida"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No puedo borrar la carpeta: %s: No existe tal"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No puedo renombrar la carpeta: %s: Operación no válida"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No pude cambiarle el nombre a la carpeta: %s: No existe"
@@ -8715,12 +8706,12 @@ msgstr "No pude cambiarle el nombre a la carpeta: %s: No existe"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2295
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2298
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconectó inesperadamente: %s"
@@ -8749,40 +8740,40 @@ msgstr "La respuesta del servidor IMAP no contenía información de %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente ha respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:216
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:235
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:301
 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:525
+#: camel/providers/imap/camel-imap-folder.c:526
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:2380
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2043
+#: camel/providers/imap/camel-imap-folder.c:2120
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo información de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2049
 msgid "Scanning for new messages"
 msgstr "Buscando mensajes nuevos"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2417
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -8791,10 +8782,10 @@ 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-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Error al cachear el mensaje %s: %s"
@@ -8807,7 +8798,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:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -8838,12 +8829,13 @@ msgstr "Para leer y guardar correo en los servidores IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Contraseña"
 
 #: camel/providers/imap/camel-imap-provider.c:82
-msgid "This option will connect to the IMAP server using a plaintext password."
+msgid ""
+"This option will connect to the IMAP server using a plaintext password."
 msgstr "Conectará con el servidor IMAP usando una contraseña de texto plano"
 
 #: camel/providers/imap/camel-imap-store.c:423
@@ -8865,7 +8857,6 @@ msgstr "Conexión cancelada"
 
 #: camel/providers/imap/camel-imap-store.c:547
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
@@ -8891,29 +8882,29 @@ msgstr "Operación no implementada"
 msgid "SSL negotiations failed"
 msgstr "Fallo en la autenticación."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:870
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "El servidor IMAP %s no implementa el método de autenticación requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "El tipo de autenticación %s no está implementado"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:904
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor escriba la contraseña IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "No escribió una clave."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:948
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8924,13 +8915,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1398
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1670
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 
@@ -8949,9 +8940,9 @@ msgstr "No puedo abrir el buzón: %s: %s\n"
 
 #. a full path + protocol
 #: camel/providers/local/camel-local-folder.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s)"
-msgstr "%s (%d)"
+msgstr "%s (%s)"
 
 #: camel/providers/local/camel-local-provider.c:43
 msgid "Use the `.folders' folder summary file (exmh)"
@@ -8970,7 +8961,10 @@ msgid "Local delivery"
 msgstr "Reparto local"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Para obtener el correo local de archivos mbox estándar."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8998,12 +8992,12 @@ msgstr "Mbox estándar de Unix"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "Para leer y guardar el correo local en directorios estándar mbox."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9014,38 +9008,38 @@ msgstr "La dirección %s no es absoluta"
 msgid "Store root %s is not a regular directory"
 msgstr "%s no es un directorio normal"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No pude acceder a la carpeta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Los almacenes locales no tienen una carpeta de entrada"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No pude cambiarle el nombre de la carpeta %s a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No pude cambiar el nombre a la carpeta: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No pude borrar el resumen la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No pude borrar el índice de la carpeta `%s': %s"
@@ -9106,7 +9100,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9151,19 +9145,17 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "No puedo abrir el maildir en esta ruta: %s: %s"
 
 #: camel/providers/local/camel-maildir-summary.c:525
-#, fuzzy
 msgid "Checking folder consistency"
-msgstr "Comprobando si hay correo nuevo"
+msgstr "Comprobando la consistencia de la carpeta"
 
 #: camel/providers/local/camel-maildir-summary.c:629
-#, fuzzy
 msgid "Checking for new messages"
-msgstr "Buscando mensajes nuevos"
+msgstr "Comprobando si hay mensajes nuevos"
 
 #: camel/providers/local/camel-maildir-summary.c:718
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Guardando carpeta"
@@ -9207,7 +9199,7 @@ msgstr "La carpeta parece estar corrompida e irrecuperable."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallo la construcción del mensaje: ¿Buzón corrompido?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9216,7 +9208,7 @@ msgstr ""
 "No puedo abrir el archivo `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9225,14 +9217,14 @@ msgstr ""
 "No pude crear el archivo `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' no es un archivo normal."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9241,7 +9233,7 @@ msgstr ""
 "No pude borrar la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no esta vacía. No fue borrada."
@@ -9256,64 +9248,64 @@ msgstr "No pude abrir la carpeta: %s: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Análisis erróneo del correo cerca de la posición %ld en la carpeta %s"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "No pude comprobar la carpeta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "No pude abrir el archivo %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No puedo abrir el archivo de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No pude cerrar la carpeta origen %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No pude cerrar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No pude cambiar el nombre a la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Resumen y carpeta no concuerdan, incluso después de una sincronización"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "No pude cambiar el nombre a la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error la escribir al archivo de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error la escribir al archivo temporal: %s: %s"
@@ -9446,9 +9438,9 @@ msgstr "El comando IMAP ha fallado: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:404
 #: camel/providers/nntp/camel-nntp-summary.c:505
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Scanning new messages"
-msgstr "Buscando mensajes nuevos"
+msgstr "%s: Buscando mensajes nuevos"
 
 #: camel/providers/nntp/camel-nntp-summary.c:520
 #, fuzzy, c-format
@@ -9456,9 +9448,8 @@ msgid "Unknown server response: %s"
 msgstr "Error desconocido: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:566
-#, fuzzy
 msgid "Use cancel"
-msgstr "Usuario cancelado"
+msgstr "Usar cancelar"
 
 #: camel/providers/nntp/camel-nntp-summary.c:568
 #, fuzzy, c-format
@@ -9523,7 +9514,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:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9542,12 +9533,17 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
+"the APOP protocol. This may not work for all users even on servers that claim "
+"to support it."
 msgstr ""
-"Esta opción es para conectar con servidores POP usando una contraseña "
-"cifrada por medio del protocolo APOP. Esto no funcionará para todos los "
-"usuarios ni siquiera en servidores que dicen implementarlo."
+"Esta opción es para conectar con servidores POP usando una contraseña cifrada "
+"por medio del protocolo APOP. Esto no funcionará para todos los usuarios ni "
+"siquiera en servidores que dicen implementarlo."
+
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "No pude conectar con %s (puerto %d): %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
@@ -9560,55 +9556,59 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "No pude conectar con el servidor POP en: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "No pude conectar con el servidor POP.\n"
 "El sistema de autenticación definido no está implementado."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-#, fuzzy
-msgid "SASL Protocol error"
-msgstr "Error crítico"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "Error de I/O"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr ""
+"No pude autenticarme en el servidor IMAP.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
-#, fuzzy, c-format
+#: camel/providers/pop3/camel-pop3-store.c:458
+#, c-format
 msgid "%sPlease enter the POP password for %s@%s"
-msgstr "%sPor favor escriba la contraseña POP3 para %s@%s"
+msgstr "%sPor favor escriba la contraseña POP para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contraseña: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No existe la carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9662,7 +9662,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:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9772,46 +9772,46 @@ msgstr "Fallo temporal en la autenticación"
 msgid "Authentication required"
 msgstr "Autenticación requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Mensaje de bienvenida erróneo: %s: posiblemente no es fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contraseña: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Parece que el mensaje no está bien construido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Expiró el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "El servidor SMTP %s no implementa el método de autenticación requerido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPor favor escriba la contraseña SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9822,90 +9822,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Envío de correo SMTP vía %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:615
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "Saludo del SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Expiró el tiempo para HELO: %s: no es fatal"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Respuesta de error al HELO: %s: no es fatal"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Expiró el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Respuesta de error a RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "Autenticación SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticación SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Expiró el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "Error en la petición de AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Respuesta de autenticación errónea desde el servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para DATA: %s: correo no enviado"
@@ -9913,40 +9913,40 @@ msgstr "Expiró el tiempo para DATA: %s: correo no enviado"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Expiró el tiempo para el envío de DATA: terminación del mensaje: %s: correo "
 "no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Expiró el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Expiró el tiempo para QUIT: %s: no es fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Expiró el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Respuesta de error a RSET: %s"
@@ -9976,19 +9976,19 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:377 mail/mail-display.c:152
 msgid "attachment"
 msgstr "adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:522
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar los elementos seleccionados de la lista de adjuntos"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:553
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Attach a file to the message"
 msgstr "Adjuntar un archivo al mensaje"
 
@@ -10020,56 +10020,60 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Presione aquí para acceder a la agenda"
 
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:378
+msgid "Reply-To:"
+msgstr "Responder a:"
+
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:174
 #.
-#. * From:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:389
 msgid "From:"
 msgstr "De:"
 
 #.
-#. * Reply-To:
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:376
-msgid "Reply-To:"
-msgstr "Responder a:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Asunto:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:188
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 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:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10077,17 +10081,25 @@ msgstr ""
 "Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje."
 
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
 #: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "No pude crear un contexto de firma PGP."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10096,34 +10108,34 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1158
 msgid "Warning!"
 msgstr "¡Aviso!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1162
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, ¿Sobreescribir?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1184
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1237
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1245
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1252
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10132,7 +10144,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1259
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10141,7 +10153,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1268
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10150,7 +10162,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1368
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10158,7 +10170,7 @@ msgstr ""
 "Ximian Evolution ha encontrado archivos no guardados de una sesión previa.\n"
 "¿Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1517
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10168,43 +10180,38 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1524
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1554
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Insertar Archivo"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1926
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
-#, fuzzy
+#: composer/e-msg-composer.c:1963
 msgid "Signature:"
-msgstr "Guardar firma"
+msgstr "Firma"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2004 mail/mail-account-gui.c:1229
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2016
 #, fuzzy
 msgid "Set as default"
 msgstr " (predeterminada)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2193 composer/e-msg-composer.c:2798
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2815
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10212,7 +10219,7 @@ msgstr ""
 "No puedo crear una ventana de composición:\n"
 "No puedo activar el control de selección de direcciones."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2841 composer/e-msg-composer.c:2896
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10220,10 +10227,10 @@ msgstr ""
 "No pude crear una ventana de composición:\n"
 "No puedo activar el componente del editor HTML."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3787
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
-"<b>"
+"<b>(The composer contains a non-text message body, which cannot be "
+"edited.)<b>"
 msgstr ""
 
 #: composer/evolution-composer.c:376
@@ -10286,7 +10293,7 @@ msgstr "El asunto contiene"
 msgid "Subject does not contain"
 msgstr "El asunto no contiene"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2347
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -10295,12 +10302,11 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Sobreescribirlo?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Recuerda esta contraseña"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Recordar esta clave durante el resto de esta sesión"
 
@@ -10309,9 +10315,8 @@ msgid "Sync Private Records:"
 msgstr ""
 
 #: e-util/e-pilot-settings.c:105
-#, fuzzy
 msgid "Sync Categories:"
-msgstr "Categorías"
+msgstr "Sincronizando categorías:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
@@ -10399,51 +10404,51 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:81
 msgid "year"
 msgstr "año"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:81
 msgid "years"
 msgstr "años"
 
-#: filter/filter-datespec.c:81
+#: filter/filter-datespec.c:82
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:81
+#: filter/filter-datespec.c:82
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:83
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:83
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:85
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:85
+#: filter/filter-datespec.c:86
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
+#: filter/filter-datespec.c:87 mail/mail-config.glade.h:185
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:196
 msgid "You have forgotten to choose a date."
 msgstr "Se ha olvidado de elegir una fecha."
 
-#: filter/filter-datespec.c:196
+#: filter/filter-datespec.c:198
 msgid "You have chosen an invalid date."
 msgstr "Ha elegido una fecha incorrecta."
 
-#: filter/filter-datespec.c:271
+#: filter/filter-datespec.c:283
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -10453,7 +10458,7 @@ msgstr ""
 "fecha del momento de ejecutar el filtro o\n"
 "cuando se abra el vfolder."
 
-#: filter/filter-datespec.c:294
+#: filter/filter-datespec.c:306
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -10461,7 +10466,7 @@ msgstr ""
 "La fecha del mensaje será comparada con la\n"
 "fecha que especifique aquí."
 
-#: filter/filter-datespec.c:334
+#: filter/filter-datespec.c:346
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -10472,45 +10477,45 @@ msgstr ""
 "filtro. Por ejemplo: «Hace una semana»."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
+#: filter/filter-datespec.c:381
 msgid "the current time"
 msgstr "la fecha actual"
 
-#: filter/filter-datespec.c:369
+#: filter/filter-datespec.c:381
 msgid "a time you specify"
 msgstr "Una fecha a especificar"
 
-#: filter/filter-datespec.c:370
+#: filter/filter-datespec.c:382
 msgid "a time relative to the current time"
 msgstr "una fecha relativa al momento actual"
 
 #. The dialog
-#: filter/filter-datespec.c:394
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Selecciones una hora con la que comparar"
 
 #. The label
-#: filter/filter-datespec.c:428
+#: filter/filter-datespec.c:440
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:558 filter/filter-datespec.c:737
 msgid "now"
 msgstr "ahora"
 
-#: filter/filter-datespec.c:575
+#: filter/filter-datespec.c:587
 msgid " ago"
 msgstr " hace"
 
-#: filter/filter-datespec.c:621
+#: filter/filter-datespec.c:633
 msgid "ago"
 msgstr "hace"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
+#: filter/filter-datespec.c:723 mail/message-list.c:1105
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: filter/filter-datespec.c:722
+#: filter/filter-datespec.c:734
 msgid "<click here to select a date>"
 msgstr "<pinche aquí para añadir una fecha>"
 
@@ -10518,31 +10523,30 @@ msgstr "<pinche aquí para añadir una fecha>"
 msgid "Filter Rules"
 msgstr "Reglas para los filtro"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Nombre del estilo:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' no existe o no es un archivo normal."
 
-#: filter/filter-file.c:286
-#, fuzzy
+#: filter/filter-file.c:307
 msgid "Choose a file"
-msgstr "Elija una acción:"
+msgstr "Elija un archivo"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Entonces"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Añadir acción"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10550,12 +10554,12 @@ msgstr ""
 "Se ha olvidado de elegir una carpeta.\n"
 "Vuelva y especifique una carpeta válida donde entregar el correo."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1462 mail/mail-account-gui.c:1476
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10564,52 +10568,78 @@ msgstr ""
 "Error en la expresión regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Importante"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+msgid "Work"
+msgstr "Trabajo"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "después de"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Prueba"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Debes dar un nombre a este filtro."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Nombre de la regla:"
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Sin título"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Ejecutar acciones"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "si se cumple algún criterio"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Añadir criterio"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "saliente"
 
@@ -10655,9 +10685,8 @@ msgstr "con todas las carpetas locales"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-#, fuzzy
 msgid "Adjust Score"
-msgstr "Asignar puntuación"
+msgstr "Ajustar puntuación"
 
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
@@ -10672,47 +10701,46 @@ msgid "Attachments"
 msgstr "Adjuntos"
 
 #: filter/libfilter-i18n.h:6
-#, fuzzy
 msgid "Beep"
-msgstr "Belen"
+msgstr "Pitar"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Compañía"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "contiene"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Fecha de recepción"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Fecha de envío"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Borrado"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "no contiene"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "no acaba en"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "no existe"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "no existe"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "no suena como"
@@ -10734,87 +10762,83 @@ msgid "ends with"
 msgstr "finaliza con"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "Ejecutar comando de shell"
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Salir"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expresión"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Importante"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "es"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "estaba después de"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "estaba antes de"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcado"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "es mayor que"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "es menor que"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "no es"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcado"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1735
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Ejecutar comando de shell"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
@@ -10836,48 +10860,71 @@ msgstr "Expresión regular"
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "es mayor que"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "es menor que"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuación"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1654
 msgid "Sender"
 msgstr "Remitente"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+msgid "Shell Command"
+msgstr "Comando de shell"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Tamaño (Kb)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "suena como"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Fuente de la cuenta"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Cabecera específica"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "comienza por"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:917
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Asunto"
 
+#: filter/libfilter-i18n.h:61
+msgid "Unset Status"
+msgstr "Sin estado"
+
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Reglas"
@@ -10894,11 +10941,11 @@ msgstr "Editar Regla"
 msgid "Score Rules"
 msgstr "Reglas de puntuación"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Debes dar un nombre a esta carpeta virtual."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Debes especificar al menos una carpeta como fuente."
 
@@ -10906,31 +10953,31 @@ msgstr "Debes especificar al menos una carpeta como fuente."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution está importando su antiguo correo de Elm"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importando..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Por favor espere"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importando %s como %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Guardando %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:318
 msgid "Mail"
 msgstr "Correo"
 
@@ -10991,39 +11038,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está importando su vieja información de Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1084
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Papelera"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Archivo de correo local %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Analizando el directorio"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Comenzando a importar"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Configuración"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editar filtros"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11057,9 +11104,8 @@ msgid "Configuration control for the Evolution Display Fonts."
 msgstr "Factoría para el compositor de correo de Evolution."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
 msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Factoría para el control de tareas de Evolution."
+msgstr "Control de configuración para las cuentas de correo de Evolution."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:4
 #, fuzzy
@@ -11104,12 +11150,12 @@ msgstr "Factoría para el componente de Resumen de Correo."
 msgid "Font Preferences"
 msgstr "Si_n recurrencia"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Cuentas"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11157,7 +11203,7 @@ msgstr "Propiedades..."
 msgid "Change this folder's properties"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11165,240 +11211,255 @@ msgstr ""
 "Algunas de tus opciones de correo parece que están corruptas, por favor "
 "comprueba que todo está en orden."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:925
 msgid "You have not set a mail transport method"
 msgstr "No ha definido un sistema para enviar el correo"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:947
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
-#, fuzzy
+#: mail/component-factory.c:953
 msgid "Warning: Unsent Messages"
-msgstr "Aviso: Mensaje modificado"
+msgstr "Aviso: Mensajes no enviados"
+
+#: mail/component-factory.c:995
+#, fuzzy
+msgid "New Message Post"
+msgstr "Siguiente mensaje"
+
+#: mail/component-factory.c:995
+#, fuzzy
+msgid "_Post Message"
+msgstr "Mensaje previo"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:996
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Nuevo mensaje"
+
+#: mail/component-factory.c:1000
 msgid "New Mail Message"
 msgstr "Nuevo mensaje de correo"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:1000 ui/evolution-mail-global.xml.h:19
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:1001
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Nuevo mensaje"
+
+#: mail/component-factory.c:1029
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1038
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "No puedo inicializar el componente de configuración de correo de Evolution."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "No puedo inicializar el componente de información sobre carpetas de "
 "Evolution."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
-#, fuzzy
+#: mail/component-factory.c:1269 mail/component-factory.c:1299
 msgid "Connecting..."
-msgstr "Conectando al servidor..."
+msgstr "Conectando..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1310
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:431
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para «%s»"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:433
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:309 mail/mail-display.c:335 mail/mail-display.c:841
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:764
 #, c-format
 msgid "%d new"
 msgstr "%d nuevos"
 
-#: mail/folder-browser.c:766 mail/folder-browser.c:774
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:767 mail/folder-browser.c:775
+#: mail/folder-browser.c:778
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d hidden"
 msgstr "%d ocultos"
 
-#: mail/folder-browser.c:770
+#: mail/folder-browser.c:771
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:776
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionado"
 
-#: mail/folder-browser.c:780
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/folder-browser.c:782
+#: mail/folder-browser.c:783
 #, c-format
 msgid "%d sent"
 msgstr "%d enviar"
 
-#: mail/folder-browser.c:784
+#: mail/folder-browser.c:785
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1091
+#: mail/folder-browser.c:1092
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear una Carpeta _Virtual según el mensaje"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1671
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual según el a_sunto"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1672
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual según el _remitente"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1673
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual según los _destinatarios"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1674
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual según la _Lista de Correo"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1678
 msgid "Filter on Sub_ject"
 msgstr "Filtrar según el As_unto"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1679
 msgid "Filter on Sen_der"
 msgstr "Filtrar según el Re_mitente"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1680
 msgid "Filter on Re_cipients"
 msgstr "Filtrar según los Des_tinatarios"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1681 mail/folder-browser.c:2015
 msgid "Filter on _Mailing List"
 msgstr "Filtrar según la Lista de _Correo"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1699
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1701
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1705 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1706 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1707 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1708
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1712
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "_Nombre completo..."
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1713
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completado"
 
-#: mail/folder-browser.c:1692
-#, fuzzy
+#: mail/folder-browser.c:1714
 msgid "Cl_ear Flag"
-msgstr "Limpiar"
+msgstr "Li_mpiar marca"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1718 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1720
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar como No Im_portante"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1726
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1730
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1731 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1717
-#, fuzzy
+#: mail/folder-browser.c:1739
 msgid "Add Sender to Address_book"
-msgstr "Añadir Remitente a la Agenda de Direcciones"
+msgstr "Añadir Remitente a la Agen_da"
 
-#: mail/folder-browser.c:1721
-#, fuzzy
+#: mail/folder-browser.c:1743
 msgid "Appl_y Filters"
-msgstr "Aplicar filtro"
+msgstr "Apl_icar filtros"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1747
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:2016
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Carpeta virtual según la Lista de Correo"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:2018
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar según la lista de correo (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:2019
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Carpeta virtual según la Lista de Correo (%s)"
@@ -11448,8 +11509,7 @@ msgid ""
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
-"Nota: Cuando se convierte entre distintos formatos de buzón de correo, "
-"puede\n"
+"Nota: Cuando se convierte entre distintos formatos de buzón de correo, puede\n"
 "que un fallo (como la falta de disco) no sea recuperable automáticamente.\n"
 "Por favor use esta opción con cuidado."
 
@@ -11465,76 +11525,65 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Editor de Noticias de Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
-#, fuzzy
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:129
 msgid "User_name:"
-msgstr "Nombre de _usuario:"
+msgstr "_Nombre de usuario:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1842
 msgid "You may not create two accounts with the same name."
 msgstr "No puedes crear dos cuentas con el mismo nombre."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Esta seguro que quiere borrar esta cuenta?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "No borrar"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "¿Realmente quiere borrar realmente la cuenta?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Inhabilitar"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Habilitar"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "¿Esta seguro que quiere borrar esta cuenta de noticias?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Habilitada"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
-#, fuzzy
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 msgid "Account name"
-msgstr "Nombre de la cuent_a:"
+msgstr "Nombre de la cuenta"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -11579,7 +11628,7 @@ msgstr ""
 "    '%s'\n"
 "Y han sido actualizadas."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:97
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11591,7 +11640,7 @@ msgstr ""
 "recibir o escribir mensajes.\n"
 "¿Querría configurarlo ahora?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11599,7 +11648,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:160
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11608,7 +11657,7 @@ msgstr ""
 "correo para poder enviarlo."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:198
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11616,11 +11665,11 @@ msgstr ""
 "Estas enviando un mensaje formateado en HTML, pero los siguientes "
 "destinatarios no indica que quieran recibir mensajes formateados en HTML:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:213
 msgid "Send anyway?"
 msgstr "¿Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:255
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11628,7 +11677,7 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "¿Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:299
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11637,11 +11686,11 @@ msgstr ""
 "esconder la lista de direcciones, este mensaje solo contendrá destinatarios "
 "Bcc."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:303
 msgid "This message contains only Bcc recipients."
 msgstr "Este mensaje solo contiene destinatarios Bcc."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:307
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11651,15 +11700,11 @@ msgstr ""
 "cabecera Apparently-To.\n"
 "¿Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:427
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:499
-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:644
+#: mail/mail-callbacks.c:660
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11667,28 +11712,28 @@ msgstr ""
 "No pude abrir la carpeta de borradores para esta cuenta.\n"
 "¿Quiere usar la carpeta de borradores predeterminada?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1052
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1056
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "El %a, %d-%m-%Y a las %H:%M, %%s escribió:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1535 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1537 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2191
 #, 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:2164
+#: mail/mail-callbacks.c:2216
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11696,7 +11741,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2255
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11704,39 +11749,39 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2269
 #, 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:2243
+#: mail/mail-callbacks.c:2295
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2340 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2394
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2396
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2467
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Mostrar el siguiente mensaje no leído"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2474
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2717
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11748,7 +11793,7 @@ msgstr ""
 "\n"
 "¿Borrar realmente esos mensajes?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2830
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11757,28 +11802,28 @@ msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:2842
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:2886
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%ld de %ld"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:2939
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:2966
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3005
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresión del mensaje"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3193 mail/mail-callbacks.c:3234
 #, 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?"
@@ -11791,18 +11836,16 @@ msgstr ""
 
 #: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
 #: mail/mail-composer-prefs.c:408
-#, fuzzy
 msgid " [script]"
-msgstr "Sin descripción"
+msgstr " [script]"
 
 #: mail/mail-composer-prefs.c:301
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
-#, fuzzy
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2823
 msgid "Unnamed"
-msgstr "Contactos sin nombre"
+msgstr "Sin nombre"
 
 #: mail/mail-composer-prefs.c:555
 #, fuzzy
@@ -11810,33 +11853,32 @@ msgid "en"
 msgstr "Enviado"
 
 #: mail/mail-composer-prefs.c:861
-#, fuzzy
 msgid "Add script signature"
-msgstr "Añadir criterio"
+msgstr "Añadir script de firma"
 
 #: mail/mail-composer-prefs.c:862
-#, fuzzy
 msgid "Add Signature"
-msgstr "Guardar firma"
+msgstr "Añadir firma"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"Please enter your name and email address below. The \"optional\" fields below "
+"do not need to be filled in, unless you wish to include this information in "
+"email you send."
 msgstr ""
 "Por favor escriba debajo su nombre y dirección de correo. Los campos  "
 "«opcionales» no hace falta que los rellene,\n"
 "a menos que quiera incluir esta información en las cartas que envíe."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Por favor rellene la información acerca del servidor de correo de entrada. "
-"Si no está seguro, pregúntele a su\n"
+"Por favor rellene la información acerca del servidor de correo de entrada. Si "
+"no está seguro, pregúntele a su\n"
 "administrador de sistemas o a su Proveedor de Servicios de Internet."
 
 #: mail/mail-config-druid.c:150
@@ -11844,24 +11886,23 @@ msgid "Please select among the following options"
 msgstr "Por favor selecciona entre las siguientes opciones"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Por favor escriba debajo la información acerca de como enviará su correo. Si "
 "no está seguro, pregúntele\n"
 "a su administrador de sistemas o a su Proveedor de Servicios de Internet."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Casi ha acabado con el proceso de configuración del correo. La identidad, el "
 "servidor de correo de entrada y\n"
@@ -11871,60 +11912,34 @@ msgstr ""
 "Este nombre solo se usará para mostrar información."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Corcho"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "después de"
-
-#: mail/mail-config.c:625
-#, fuzzy, c-format
+#: mail/mail-config.c:617
+#, c-format
 msgid "Account %d"
-msgstr "Cuenta"
+msgstr "Cuenta %d"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2543
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2621 mail/mail-config.c:2625
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
 msgid " "
-msgstr ", "
+msgstr " "
 
 #: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Comprobar tipos soportados "
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
-msgstr "(SSL no está implementado en esta compilación de evolution)"
+msgstr "(SSL no está soportado en esta compilación de evolution)"
 
 #: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
@@ -11936,12 +11951,11 @@ msgstr "S_iempre cifrarme a mí mismo cuando envíe correo cifrado"
 
 #: mail/mail-config.glade.h:6
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr ""
+msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnÑñoOPpQqRrSsTtUuVvWwXxYyZz"
 
 #: mail/mail-config.glade.h:7
-#, fuzzy
 msgid "Account Editor"
-msgstr "Cuenta %d"
+msgstr "Editor de cuentas"
 
 #: mail/mail-config.glade.h:8
 msgid "Account Information"
@@ -11952,22 +11966,18 @@ msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
 #: mail/mail-config.glade.h:10
-#, fuzzy
 msgid "Add Sc_ript"
-msgstr "Añadir criterio"
+msgstr "Añadir script"
 
 #: mail/mail-config.glade.h:11
-#, fuzzy
 msgid "Add new signature..."
-msgstr "Guardar firma"
+msgstr "Añadir nueva firma..."
 
 #: mail/mail-config.glade.h:12
-#, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "S_iempre cifrarme a mí mismo cuando envíe correo cifrado"
 
 #: mail/mail-config.glade.h:14
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Firmar _siempre el correo saliente al usar esta cuenta"
 
@@ -11984,9 +11994,8 @@ msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
 #: mail/mail-config.glade.h:19
-#, fuzzy
 msgid "Attach original message"
-msgstr "Adjuntar un archivo al mensaje"
+msgstr "Adjuntar mensaje original"
 
 #: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
@@ -11997,27 +12006,24 @@ msgid "Authentication"
 msgstr "Autenticación"
 
 #: mail/mail-config.glade.h:22
-#, fuzzy
 msgid "Automatically _detect links"
-msgstr "Comprobar el correo _automáticamente"
+msgstr "_Detectar enlaces automáticamente"
 
 #: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
-msgstr ""
+msgstr "Báltico (ISO-8859-13)"
 
 #: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
-msgstr ""
+msgstr "Báltico (ISO-8859-4)"
 
 #: mail/mail-config.glade.h:25
-#, fuzzy
 msgid "C_haracter set:"
-msgstr "Juego de caracteres desconocido: %s"
+msgstr "Juego de caracteres:"
 
 #: mail/mail-config.glade.h:26
-#, fuzzy
 msgid "C_olors"
-msgstr "_Cerrar"
+msgstr "C_olores"
 
 #: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
@@ -12033,9 +12039,8 @@ msgid "Color for _misspelled words:"
 msgstr "Color para las tareas para hoy"
 
 #: mail/mail-config.glade.h:30
-#, fuzzy
 msgid "Composing Messages"
-msgstr "Nuevo mensaje"
+msgstr "Componiendo mensajes"
 
 #: mail/mail-config.glade.h:31
 msgid "Configuration"
@@ -12175,243 +12180,228 @@ msgstr "Guardar y cerrar"
 msgid "Loading Images"
 msgstr "Cargar _Imágenes"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Localización del Mailbox"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cabecera del mensaje"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micronesia"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "Servidor NNTP:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Notificación"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Fuentes de _noticias"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Información opcional"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clave PGP:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Elije un color"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt 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:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimir los contactos seleccionados"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "No puedo abrir el mensaje"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "Re_cuerda esta contraseña"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Responder a:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opciones de recepción"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Recuerda esta contraseña"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Información requerida"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Predeterminados"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Seguridad"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
-msgstr ""
+msgstr "Selecciona letra de anchura fija para HTML"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
-msgstr ""
+msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
-msgstr ""
+msgstr "Selecciona letra de anchura variable en HTML"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
-msgstr ""
+msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/help/hyperbola-filefmt.c:397
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Tipo de servidor:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Atajos"
 
-#: mail/mail-config.glade.h:118
-#, fuzzy
+#: mail/mail-config.glade.h:116
 msgid "Signature #1"
-msgstr "Guardar firma"
+msgstr "Firma #1"
 
-#: mail/mail-config.glade.h:119
-#, fuzzy
+#: mail/mail-config.glade.h:117
 msgid "Signature #2"
-msgstr "Guardar firma"
-
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Fuente"
+msgstr "Firma #2"
 
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Información de la Fuente"
-
-#: mail/mail-config.glade.h:122
-#, fuzzy
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
-msgstr "Nombre del estilo:"
+msgstr "Especificar nombre de archivo:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Mailbox estándar de Unix"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:125
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12421,204 +12411,190 @@ msgstr ""
 "\n"
 "Pulse «Siguiente» para comenzar. "
 
-#: mail/mail-config.glade.h:140
-#, fuzzy
+#: mail/mail-config.glade.h:136
 msgid "XEmacs"
-msgstr "Este"
+msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:142
-#, fuzzy
+#: mail/mail-config.glade.h:138
 msgid "_Add Signature"
-msgstr "_Archivo de firma:"
+msgstr "_Añadir firma"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "C_argar imágenes fuera de la red"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Firm_ar siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "Tipo de _autenticación: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tipo de _autenticación: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "Comprobar el correo _automáticamente"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Comprobar el correo _automáticamente"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID del _certificado:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Confirmar antes de comprimir una carpeta"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Firma en _HTML:"
 
-#: mail/mail-config.glade.h:153
-#, fuzzy
+#: mail/mail-config.glade.h:149
 msgid "_Defaults"
-msgstr "Predeterminados"
+msgstr "Pre_determinados"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
-#, fuzzy
+#: mail/mail-config.glade.h:153
 msgid "_Enable"
-msgstr "Habilitar"
+msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
-#, fuzzy
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
-msgstr "_Reenviar Mensaje"
+msgstr "_Estilo de reenvio:"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
-#: mail/mail-config.glade.h:162
-#, fuzzy
+#: mail/mail-config.glade.h:158
 msgid "_HTML Mail"
-msgstr "Correo en HTML"
+msgstr "Correo en _HTML"
 
-#: mail/mail-config.glade.h:164
-#, fuzzy
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
-msgstr "Identidad"
+msgstr "_Identidad"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 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:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Hacer de esta mi cuenta pre_determinada"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como Leído tras"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_No cargar nunca imágenes desde la red"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Localización del binario de _PGP:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Preguntar al mandar mensajes en HTML a contactos que no los quieren"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al mandar mensajes con el asunto vacío"
 
-#: mail/mail-config.glade.h:175
-#, fuzzy
+#: mail/mail-config.glade.h:171
 msgid "_Receiving Mail"
-msgstr "Recibiendo Mensajes"
+msgstr "_Recibiendo correo"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Re: Todos"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Seguridad"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Seguridad"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Mostrar tiempo como"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Archivo de firma:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "U_se conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_cada"
 
-#: mail/mail-config.glade.h:186
-#, fuzzy
+#: mail/mail-config.glade.h:182
 msgid "color"
 msgstr "color"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "descripción"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12642,38 +12618,39 @@ msgstr "No pude crear un contexto sobre tipo S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "No pude crear un contexto de decodificación S/MIME."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:280
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:345
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Guardar en disco..."
-
 #: mail/mail-display.c:391
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Guardar adjunto"
+
+#: mail/mail-display.c:392
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:393
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:453
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (vía %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:457
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:478
 msgid "External Viewer"
 msgstr "Visores externos"
 
@@ -12681,7 +12658,7 @@ msgstr "Visores externos"
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1545
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tareas fuera de pla_zo:"
@@ -12744,59 +12721,59 @@ msgstr "Bcc"
 msgid "Mailer"
 msgstr "Correo"
 
-#: mail/mail-format.c:1736
-#, fuzzy
+#: mail/mail-format.c:1737
 msgid "View messages..."
-msgstr "Guardar mensaje como..."
+msgstr "Ver mensajes..."
 
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1834
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Este mensaje está firmado digitalmente. Pulsa en el icono del candado para "
 "más información."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1861
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "No pude crear un contexto de verificación PGP."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1870
 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:1876
-msgid "This message is digitally signed but can not be proven to be authentic."
+#: mail/mail-format.c:1878
+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:2126
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2142
 #, 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:2145
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
@@ -12885,96 +12862,96 @@ msgstr "Filtrando carpeta"
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:546 mail/mail-ops.c:575
 msgid "However, the message was successfully sent."
 msgstr "Aun así, este mensaje fue enviado correctamente."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando «%s»"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:731
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:750
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:752 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:846
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1217
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1260
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1332
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1405
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta '%s'"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1550
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1586
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1635
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1707
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1793
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1905
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12983,7 +12960,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1933
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12992,11 +12969,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2007
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2024
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13005,27 +12982,22 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2054
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2202
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2202
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "Ejecutando el comando de shell: %s"
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -13082,32 +13054,41 @@ msgstr "Camino: %s, Tipo: %s"
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Cancelar todo"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Recuerda esta contraseña"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Recordar esta clave durante el resto de esta sesión"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
@@ -13146,8 +13127,7 @@ msgstr "Guardar firma"
 #: mail/mail-signature-editor.c:407
 msgid ""
 "If you would like to use an old signature, you may import it by opening the "
-"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
-"item."
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" item."
 msgstr ""
 
 #: mail/mail-signature-editor.c:416
@@ -13164,7 +13144,7 @@ msgstr "Reenviado mensaje - %s"
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Mensaje reenviado"
 
@@ -13178,7 +13158,7 @@ msgstr "Configurando vfolder: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualizando carpetas virtuales para la uri: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13191,94 +13171,94 @@ msgstr ""
 "    '%s'\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:266
+#: my-evolution/e-summary-mail.c:747
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tratando de editar una carpeta virtual `%s' que no existe."
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Sin asunto)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensaje"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:722
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:723
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:724
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:725
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:726
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:730
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:731
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:735
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:736
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1069
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1076
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1085
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1097
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1107
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2539
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -13320,9 +13300,8 @@ msgid "Size"
 msgstr "Tamaño"
 
 #: mail/message-tag-followup.c:57
-#, fuzzy
 msgid "Call"
-msgstr "McCall"
+msgstr "Llamada"
 
 #: mail/message-tag-followup.c:58
 #, fuzzy
@@ -13351,11 +13330,11 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Re: Todos"
 
@@ -13364,7 +13343,7 @@ msgstr "Re: Todos"
 msgid "Review"
 msgstr "Previsualización"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:319
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "_Nombre completo..."
@@ -13394,11 +13373,11 @@ msgstr "De-suscribiendo la carpeta «%s»"
 msgid "Folder"
 msgstr "Carpeta"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1516
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1577
 msgid "Please select a server."
 msgstr "Por favor seleccione un servidor."
 
@@ -17864,11 +17843,11 @@ msgid "Kushiro Airport"
 msgstr "Kushiro Airport"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -22540,9 +22519,8 @@ msgid "Utsunomiya Ab"
 msgstr ""
 
 #: my-evolution/Locations.h:2352
-#, fuzzy
 msgid "Uzhgorod"
-msgstr "Europa/Uzhgorod"
+msgstr "Uzhgorod"
 
 #: my-evolution/Locations.h:2353
 msgid "Vadso"
@@ -23292,8 +23270,8 @@ msgstr "Sin descripción"
 msgid "Mail summary"
 msgstr "Resumen de correo"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:271 my-evolution/e-summary-mail.c:422
+#: my-evolution/e-summary-mail.c:750 shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
@@ -23332,26 +23310,24 @@ msgid "News Feed"
 msgstr "Fuentes de noticias"
 
 #: my-evolution/e-summary-shown.c:536
-#, fuzzy
 msgid "All"
-msgstr "McAllen"
+msgstr "Todo"
 
 #. Fixme: nice GFX version
 #: my-evolution/e-summary-shown.c:545
-#, fuzzy
 msgid "Add"
-msgstr "Aña_dir"
+msgstr "Añadir"
 
 #: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "No hay tareas"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Sin descripción)"
 
@@ -24681,7 +24657,7 @@ msgstr "Mostrar detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar operación"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24691,24 +24667,23 @@ msgstr ""
 "%s"
 
 #: shell/e-folder-list.c:312
-#, fuzzy
 msgid "Add a Folder"
-msgstr "Seleccionar carpeta"
+msgstr "Añadir una carpeta"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Borradores"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1061
 msgid "Inbox"
 msgstr "Entrada"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Salida"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Enviado"
 
@@ -24721,8 +24696,8 @@ msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
-"Esta nueva versión de Evolution necesita instalar archivos adicionales\n"
-"en su carpeta personal de Evolution"
+"Esta nueva versión de Evolution necesita instalar archivos "
+"adicionales\nen su carpeta personal de Evolution"
 
 #: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
@@ -24848,14 +24823,13 @@ msgid "Offline Folders"
 msgstr "Seleccionar carpeta"
 
 #: shell/e-shell-config-folder-settings.c:77
-#, fuzzy
 msgid "Autocompletion Folders"
-msgstr "Fecha de vencimiento"
+msgstr "Autocompletar carpetas"
 
 #: shell/e-shell-folder-commands.c:140
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot copy folder: %s"
-msgstr "No pude comprobar la carpeta: %s: %s"
+msgstr "No pude copiar la carpeta: %s"
 
 #: shell/e-shell-folder-commands.c:143
 #, fuzzy, c-format
@@ -24949,22 +24923,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Crear nuevas carpetas"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"El tipo de carpeta seleccionada no es valido para\n"
-"la operación requerida."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Crear una _Nueva Carpeta..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nuevo..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
@@ -24980,12 +24947,12 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Elija el archivo que quiere importar a Evolution, y seleccione de la lista "
-"el tipo de archivo que es.\n"
+"Elija el archivo que quiere importar a Evolution, y seleccione de la lista el "
+"tipo de archivo que es.\n"
 "\n"
 "Si no lo sabe, puede elegir «Automático» y Evolution tratará de encargarse."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor seleccione la información que quieras importar:"
 
@@ -25016,34 +24983,30 @@ msgstr ""
 msgid "Select importer"
 msgstr "Seleccionar carpeta"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "El archivo %s no existe"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Solo puedes importar a carpetas locales"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
-"No hay ninguna herramienta para importar datos que pueda encargarse de\n"
-"%s"
+"No hay ninguna herramienta para importar datos que pueda encargarse "
+"de\n%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25052,17 +25015,17 @@ msgstr ""
 "Importando %s.\n"
 "Comenzando %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25071,31 +25034,31 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Tipo de archivo:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Importa datos y configuración de programas antiguos"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Importar un único archivo"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25103,24 +25066,24 @@ msgstr ""
 "Por favor espere...\n"
 "Buscando configuraciones existentes"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importar"
 
@@ -25138,7 +25101,6 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-offline-sync.c:239
-#, fuzzy
 msgid "Syncing Folder"
 msgstr "Sincronizando carpeta"
 
@@ -25188,8 +25150,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "No pude iniciar la interfaz del Asistente de Correo de Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:546
+#: shell/e-shell-user-creatable-items-handler.c:598
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nuevo"
@@ -25231,58 +25193,59 @@ msgstr "Ir a la carpeta..."
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Crear un nuevo atajo"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Seleccione la carpeta a la que quiere que apunte el atajo:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrándose)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(nada)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution está conectado.  Pulse este botón para trabajar "
 "desconectado."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution está en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution está desconectado.  Pulse este botón para trabajar "
 "conectado."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25294,12 +25257,12 @@ msgstr ""
 "El error del sistema de activación es:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25310,31 +25273,31 @@ msgstr ""
 "«%s» ha fallado inesperadamente. Deberá salir de Evolution y volver\n"
 "a entrar para poder acceder otra vez a esa información."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "No puedo registrarme en OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Error genérico"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Nombre del grupo:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25343,109 +25306,109 @@ msgstr ""
 "¿Realmente quiere quitar el grupo\n"
 "`%s' del menú de atajos?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "No quitar"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Renombrar Grupo de Atajos"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Renombrar grupos de atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:228
 msgid "_Small Icons"
 msgstr "Icono_s pequeños"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:229
 msgid "Show the shortcuts as small icons"
 msgstr "Mostrar los atajos como iconos pequeños"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:231
 msgid "_Large Icons"
 msgstr "Iconos _grandes"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:232
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar los atajos como iconos grandes"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:243
 msgid "_New Group..."
 msgstr "_Nuevo grupo..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:244
 msgid "Create a new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:246
 msgid "_Remove this Group..."
 msgstr "_Quitar este Grupo..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:247
 msgid "Remove this shortcut group"
 msgstr "Quitar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:249
 msgid "Re_name this Group..."
 msgstr "Re_nombrar este Grupo..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:250
 msgid "Rename this shortcut group"
 msgstr "Renombrar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:255
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:256
 msgid "Hide the shortcut bar"
 msgstr "Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:375
 msgid "Rename shortcut"
 msgstr "Renombrar atajo"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:376
 msgid "Rename selected shortcut to:"
 msgstr "Renombrar atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:389
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir la carpeta enlazada a este atajo"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:391 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Abrir en una Nueva _Ventana"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:391
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abrir la carpeta asociada a este atajo en una nueva ventana"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-icon-view.c:328
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:394
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:394
 msgid "Rename this shortcut"
 msgstr "Renombrar este atajo"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:396
 msgid "Re_move"
 msgstr "Bo_rrar"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:396
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1053
 msgid "Shortcuts"
 msgstr "Atajos"
 
@@ -25454,55 +25417,55 @@ msgstr "Atajos"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Sin errores"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Es tipo de archivo especificado no es válido"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "Error de I/O"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "No hay suficiente espacio para crear la carpeta"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Esta carpeta no está vacía"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "No se encontró la carpeta especificada"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Función sin implementar en este manejador"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operación no implementada"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no está implementado por este manejador"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "La carpeta especificada no puede ser modificado o borrado"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "No puedo mover una carpeta dentro de uno de sus descendientes"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "No puedo crear una carpeta con ese nombre"
 
@@ -25557,70 +25520,69 @@ msgstr ""
 "El error del sistema de activación es:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1088
 msgid "CORBA error"
 msgstr "Error CORBA"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1090
 msgid "Interrupted"
 msgstr "Interrumpido"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1092
 msgid "Invalid argument"
 msgstr "Argumento inválido"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1094
 msgid "Already has an owner"
 msgstr "Ya tiene un dueño"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1096
 msgid "No owner"
 msgstr "Sin dueño"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1098
 msgid "Not found"
 msgstr "No encontrado"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1100
 msgid "Unsupported type"
 msgstr "Tipo no soportado"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1102
 msgid "Unsupported schema"
 msgstr "Schema no soportado"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1104
 msgid "Unsupported operation"
 msgstr "Operación no soportada"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1106
 msgid "Internal error"
 msgstr "Error interno"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1110
 msgid "Exists"
 msgstr "Salir"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1112
 msgid "Invalid URI"
 msgstr "URI no válida"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1116
 msgid "Has subfolders"
 msgstr "Tiene subcarpetas"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1118
 msgid "No space left"
 msgstr "No queda sitio"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1120
 msgid "Old owner has died"
 msgstr "El antiguo dueño a muerto"
 
 #: shell/evolution-test-component.c:49
-#, fuzzy
 msgid "Test type"
-msgstr "tipo de soporte"
+msgstr "Tipo de pruebas"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -25638,6 +25600,23 @@ msgstr "Servidor"
 msgid "The following connections are currently active:"
 msgstr "Las siguientes conexiones están actualmente activas:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "C_alendario:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+msgid "_Contacts:"
+msgstr "_Contactos:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Correo:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Tareas"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nombre de la carpeta:"
@@ -25650,6 +25629,33 @@ msgstr "Tipo de carpeta:"
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Crear una _Nueva Carpeta..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_Folder Name:"
+msgstr "_Nombre de la carpeta:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Nombre del _servidor:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Nombre de _usuario:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuración de Evolution"
@@ -25746,15 +25752,15 @@ msgstr "No me preguntes más veces"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution puede importar datos de los siguiente s archivos:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution está terminando ..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25774,53 +25780,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "No me preguntes más veces"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No puedo acceder a la shell de Ximian Evolution."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No puedo inicializar la shell de Ximian Evolution: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Deshabilitar pantalla de entrada"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comenzando a importar"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar la salida de depurado de todos los componente a un archivo."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
@@ -25853,72 +25859,69 @@ msgid "Copy the selection"
 msgstr "Copiar la selección"
 
 #: ui/evolution-addressbook.xml.h:5
-#, fuzzy
 msgid "Copy to Folder..."
-msgstr "_Copiar a la carpeta..."
-
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Crear nuevo contacto"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Crear nueva lista de contactos"
+msgstr "Copiar a la carpeta..."
 
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Cortar la selección"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Borrar los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Mover mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Pegar el contenido del porta papeles"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Vista previa de los contactos a imprimir"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Vista pre_via"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Imprimir los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Guardar los contactos seleccionados en una VCard."
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Seleccionar todos los contactos"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Enviar un mensaje a los contactos seleccionados"
 
 #
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Enviar los contactos seleccionados a otra persona."
 
@@ -25926,55 +25929,51 @@ msgstr "Enviar los contactos seleccionados a otra persona."
 # components/music/nautilus-music-view.c:1158
 # src/file-manager/dfos-xfer.c:352 src/file-manager/dfos-xfer.c:372
 # src/nautilus-window-toolbars.c:156
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Parar la carga"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "la fecha actual"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "A_cciones"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Lista de _contactos"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Reenviar contactos..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "G_uardar como vCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "Bu_scar contactos"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Seleccionar todo"
 
 #
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Enviar un _mensaje al contacto..."
@@ -26019,11 +26018,6 @@ msgstr "Mes"
 msgid "Previews the calendar to be printed"
 msgstr "Vista previa del calendario a imprimir"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Vista pre_via"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
@@ -26058,7 +26052,7 @@ msgstr "Semana"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Cerrar"
 
@@ -26071,7 +26065,7 @@ msgid "Delete this item"
 msgstr "Borrar este elemento"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Barra de herramientas principal"
 
@@ -26083,8 +26077,8 @@ msgstr "Ver el elemento que va a ser impreso"
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Guardar"
 
@@ -26111,9 +26105,9 @@ msgstr "Guardar este elemento a disco"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Archivo"
 
@@ -26123,7 +26117,7 @@ msgstr "Imprimir ca_becera..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Guardar _como..."
 
@@ -26138,8 +26132,8 @@ msgstr "Enviar un _mensaje al contacto..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -26238,26 +26232,41 @@ msgstr ""
 "Eliminar permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Componer un _nuevo mensaje"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a Message"
+msgstr "%s - Mensaje"
+
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Guardando mensajes en la carpeta"
+
+#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "Mostrar ventana de vista previa del mensajes"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Suscribirse o de-suscribirse de carpetas de los servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:16
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Preview Pane"
 msgstr "Vista _previa"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Subscribe to Folders..."
 msgstr "_Suscribirse a las carpetas..."
 
@@ -26358,7 +26367,7 @@ msgstr "Lista de Mensajes Encadenados"
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Carpeta"
 
@@ -26375,19 +26384,16 @@ msgid "_Threaded Message List"
 msgstr "_Lista de Mensajes Encadenados"
 
 #: ui/evolution-mail-message.xml.h:1
-#, fuzzy
 msgid "A_dd Sender to Addressbook"
-msgstr "Añadir Remitente a la Agenda de Direcciones"
+msgstr "Aña_dir Remitente a la Agenda"
 
 #: ui/evolution-mail-message.xml.h:2
-#, fuzzy
 msgid "A_pply Filters"
-msgstr "Aplicar filtro"
+msgstr "A_plicar filtros"
 
 #: ui/evolution-mail-message.xml.h:3
-#, fuzzy
 msgid "Add Sender to Addressbook"
-msgstr "Añadir Remitente a la Agenda de Direcciones"
+msgstr "Añadir Remitente a la Agenda"
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
@@ -26478,12 +26484,8 @@ msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no leído"
 
 #: ui/evolution-mail-message.xml.h:28
-#, fuzzy
 msgid "F_orward"
-msgstr ""
-"#-#-#-#-#  evolution-es.po (evolution 1.0)  #-#-#-#-#\n"
-"Reenviar#-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#\n"
-"Adelante"
+msgstr "R_eenviar"
 
 #: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
@@ -26502,9 +26504,8 @@ msgid "Filter on _Subject..."
 msgstr "Filtrar según el a_sunto..."
 
 #: ui/evolution-mail-message.xml.h:33
-#, fuzzy
 msgid "Flag selected message(s) for follow-up"
-msgstr "Marcar los mensajes seleccionados para borrar"
+msgstr "Marcar los mensajes seleccionados para seguimiento"
 
 #: ui/evolution-mail-message.xml.h:34
 #, fuzzy
@@ -26624,186 +26625,198 @@ msgstr "Mensaje anterior no leído"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Respuesta a una tarea"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Mensaje importante previo"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/music/nautilus-music-view.c:1122
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Imprimir este mensaje"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Re_direct"
 msgstr "Directorio de inicio"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Reenviar el mensaje seleccionado a alguien"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Dejar el texto en su tamaño original"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "Bu_scar mensaje..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Más pequeño"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Guardar el mensaje en un archivo de texto"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Configurar los datos de la página para la impresora actual"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Mostrar la fuente del men_saje"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Mostrar cabeceras completas"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Mostrar mensajes en el estilo normal"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Mostrar mensajes con todas las cabeceras"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Mostrar la fuentes sin formatear del mensaje"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Ta_maño del texto"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Recuperar los mensajes seleccionados"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Carpeta virtual según la _Lista de Correo..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Carpeta virtual según el Remite_nte..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "Carpeta virtual según los Destinata_rios..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "Carpeta virtual según el A_sunto..."
 
-#: ui/evolution-mail-message.xml.h:92
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
-msgstr "Adjuntar"
+msgstr "_Adjunto"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Copiar a la Carpeta"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:98
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
-msgstr "Ir a"
+msgstr "_Ir a"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Incluido en línea"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Mayor"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Mover a la Carpeta"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Siguiente mensaje"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "Vista _Normal"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Abrir Mensaje"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Mensaje previo"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+msgid "_Resend..."
+msgstr "_Reenviar..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Cerrar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-global-preferences.c:222
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Vista"
 
@@ -26831,173 +26844,165 @@ msgstr "Cifra este mensaje con su certificado de cifrado S/MIME"
 msgid "For_mat"
 msgstr "For_mato"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Archivo de texto en línea..."
-
-#: 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:12
-msgid "Insert text file..."
-msgstr "Insertar un archivo de texto..."
-
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2114
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Abrir"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Cifrar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Firmar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Guardar como"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Guardar _Borrador"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Guardara el mensaje a una carpeta específica"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Enviar _mas tarde"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Enviar _mas tarde"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: 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:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Enviar este mensaje ahora"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Mostrar / ocultar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Mostrar _adjuntos"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Mostrar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con su clave PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Firmar este mensaje con su certificado de firma S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Activa si se muestra el campo CCO"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Activa si se muestra el campo CC"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Activa si se muestra el selector 'De'"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Activa si se muestra el campo Responder-A"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Adjunto..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Campo Cc_o"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Guardar el elemento y cerrar la ventana de diálogo"
+
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/nautilus-window-menus.c:1325
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "A_yuda"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Guardar firma"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Añadir carpeta a su lista de carpetas suscritas"
@@ -27095,174 +27100,204 @@ msgid "Add to _Shortcut Bar"
 msgstr "Añadir a la barra de atajo_s"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Cambiar el nombre de esta carpeta"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Copiar esta carpeta"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Crear una _Nueva Carpeta..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Crear un enlace a esta carpeta en la lista de atajos"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Crear una nueva carpeta"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Crear un nuevo atajo"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Crear una nueva carpeta"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Borrar esta carpeta"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Mostrar una carpeta distinta"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Ventana de Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Salir del programa"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Importar datos de otros programas"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Mueve esta carpeta a otro sitio"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Crear una _Nueva Carpeta..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2126
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Abrir en una ventana nueva"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Abre esta carpeta en una nueva ventana"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Configuración del pilot..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar el correo en la cola y obtener el nuevo"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Configuración del correo"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Mostrar información acerca de Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Enviar reporte de fallo"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un reporte de fallo usando Bug Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Activar"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Activar si se estamos trabajando desconectados o no."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Ximian Evolution"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "Barra de _carpetas"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+msgid "_Folder..."
+msgstr "_Carpeta..."
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Nuevo"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Nueva carpeta"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Configuración del pilot..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Si_n recurrencia"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
+#: ui/evolution.xml.h:59
+msgid "_Shortcut Bar"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:55
-msgid "_Shortcut Bar"
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
 msgstr "Barra de atajo_s"
 
 #: ui/my-evolution.xml.h:3
@@ -27278,17 +27313,37 @@ msgid "Reload the view"
 msgstr "Regenerar la vista"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Tarjetas de Visita"
+msgid "By _Company"
+msgstr "Por _Compañía"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Por Compañía"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Tarjetas de Visita"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Lista de teléfonos"
 
+#: views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "Vista S_emanal"
+
+#: views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "Vista _Diaria"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Vista Mensual"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Vista de la Semana Laboral"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -27314,13 +27369,18 @@ msgstr "Por asunto"
 msgid "Messages"
 msgstr "Mensajes"
 
+#: views/tasks/galview.xml.h:1
+msgid "With _Category"
+msgstr "Con _categoría"
+
 #: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr "Con categoría"
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Tarea"
 
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -27454,9 +27514,8 @@ msgid "Ukrainian"
 msgstr "Ucraniano"
 
 #: widgets/misc/e-charset-picker.c:95
-#, fuzzy
 msgid "Visual"
-msgstr "Visalia"
+msgstr "Visual"
 
 #: widgets/misc/e-charset-picker.c:164
 #, c-format
@@ -27479,18 +27538,17 @@ msgstr "Codificación de Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Editor de búsquedas"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Guardar búsqueda"
 
 #: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
-#, fuzzy
 msgid "_Save Search..."
-msgstr "Guardar búsqueda"
+msgstr "_Guardar búsqueda..."
 
 #: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
@@ -27523,21 +27581,20 @@ msgstr "Mensaje"
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Buscar ahora"
 
-#: widgets/misc/e-search-bar.c:513
-#, fuzzy
+#: widgets/misc/e-search-bar.c:520
 msgid "_Clear"
-msgstr "Limpiar"
+msgstr "_Limpiar"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Limpiar"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Buscar ahora"
 
@@ -27563,6 +27620,144 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution no puede obtener la agenda local. Esto se puede deber a que "
+#~ "haya fallado el componente evolution-addressbook. Para ayudarnos a "
+#~ "entender mejor y finalmente resolver el problema, por favor envíe un "
+#~ "mensaje a Jon Trowbridge <trow@ximian.com> con una descripción detallada "
+#~ "de las circunstancias bajo las que ocurrió este error.  Gracias."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution no puede obtener la agenda de direcciones local.\n"
+#~ "Bajo circunstancias normales, esto no debería pasar nunca.\n"
+#~ "Puede que necesites salir y reiniciar Evolution para arreglar\n"
+#~ "este problema."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Mover..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr ""
+#~ "El estado de la reunión a cambiado. ¿Enviar una versión actualizada?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Borrar esta cita"
+
+#, fuzzy
+#~ msgid "SASL Protocol error"
+#~ msgstr "Error crítico"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "Error de I/O"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Mensaje de bienvenida erróneo: %s: posiblemente no es fatal"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Expiró el tiempo para HELO: %s: no es fatal"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Respuesta de error al HELO: %s: no es fatal"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Expiró el tiempo para QUIT: %s: no es fatal"
+
+#~ msgid "Insert File"
+#~ msgstr "Insertar Archivo"
+
+#, fuzzy
+#~ msgid "Command"
+#~ msgstr "Compañía"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Editor de Noticias de Evolution"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "¿Esta seguro que quiere borrar esta cuenta de noticias?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Debe configurar una cuenta antes de poder enviar este mensaje."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "Servidor NNTP:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Fuentes de _noticias"
+
+#~ msgid "Source"
+#~ msgstr "Fuente"
+
+#~ msgid "Source Information"
+#~ msgstr "Información de la Fuente"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Guardar en disco..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Ejecutando el comando de shell: %s"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Crear nuevas carpetas"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "El tipo de carpeta seleccionada no es valido para\n"
+#~ "la operación requerida."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Solo puedes importar a carpetas locales"
+
+#~ msgid "Create new contact"
+#~ msgstr "Crear nuevo contacto"
+
+#~ msgid "Create new contact list"
+#~ msgstr "Crear nueva lista de contactos"
+
+#~ msgid "_Contact List"
+#~ msgstr "Lista de _contactos"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Archivo de texto en línea..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Insertar un archivo como texto en el mensaje"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Insertar un archivo de texto..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Enviar _mas tarde"
+
+#~ msgid "Send _later"
+#~ msgstr "Enviar _mas tarde"
+
+#~ msgid "Send the message later"
+#~ msgstr "Enviar el mensaje más tarde"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Configuración del pilot..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Fuentes de la agenda de direcciones"
@@ -28014,9 +28209,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Carpeta para guardar correo (interno)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "No puedo conectar con el almacén: %s"
-
 #~ msgid "Create vFolder from Search"
 #~ msgstr "Crear carpeta virtual de la búsqueda"
 
@@ -28064,9 +28256,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_Organización:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Recuerda esta contraseña"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Enviar el men_saje en formato HTML de forma predeterminada"
 
@@ -28128,16 +28317,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Create a _New Meeting"
 #~ msgstr "Crear una _nueva cita"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Crear una nueva cita"
-
-#, fuzzy
-#~ msgid "Create a new meeting request"
-#~ msgstr "Crear una nueva tarea"
-
-#~ msgid "Create a new task"
-#~ msgstr "Crear una nueva tarea"
-
 #~ msgid "Create an event for the whole day"
 #~ msgstr "Crear un evento para todo el día"