Update the po files to cut down on dist time

02-05-08 JP Rosevear <jpr@ximian.com> * Update the po files to cut down on dist time svn path=/trunk/; revision=16721
author: JP Rosevear <jpr@ximian.com> 2002-05-08 21:37:33 +0800
committer: JP Rosevear <jpr@src.gnome.org> 2002-05-08 21:37:33 +0800
commit: b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06 (patch)
tree: 5cb241d8ec2ea0a75d38ad395bd3578089e3250c /po/es.po
parent: d02b29d95446c200856d69d0bf0abe856ed7a96f (diff)
download: gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.gz
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.bz2
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.lz
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.xz
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.zst
gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.zip
1 files changed, 4426 insertions, 3189 deletions
diff --git a/po/es.po b/po/es.po
index c91202ebb6..6803746884 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1\n"
-"POT-Creation-Date: 2002-03-03 21:23+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-0400\n"
 "PO-Revision-Date: 2002-03-03 21:29+0100\n"
 "Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -32,7 +32,7 @@ msgid "Imports VCard files into Evolution."
 msgstr "Importa archivos VCard a Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:332
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 msgid "File As"
 msgstr "Archivar como"
 
@@ -43,11 +43,12 @@ msgstr "Archivar como"
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nombre"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:334
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -63,7 +64,7 @@ msgstr "Ppal"
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/contact-editor/e-contact-editor.c:1716
-#: addressbook/gui/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistente"
 
@@ -103,7 +104,7 @@ msgid "Home"
 msgstr "Casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:341
+#: addressbook/gui/widgets/e-addressbook-view.c:344
 msgid "Organization"
 msgstr "Organización"
 
@@ -125,7 +126,7 @@ msgstr "Coche"
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
 #: addressbook/gui/contact-editor/e-contact-editor.c:1719
-#: addressbook/gui/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
@@ -135,7 +136,7 @@ msgstr "Fax de Trab"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1725
-#: addressbook/gui/widgets/e-addressbook-view.c:347
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax de casa"
 
@@ -155,7 +156,7 @@ msgstr "Casa 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1726
-#: addressbook/gui/widgets/e-addressbook-view.c:350
+#: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "RDSI"
 
@@ -165,55 +166,54 @@ msgstr "RDSI"
 #: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/contact-editor/e-contact-editor.c:1728
 #: addressbook/gui/contact-editor/e-contact-editor.c:1786
-#: mail/mail-config.glade.h:58
 msgid "Other"
 msgstr "Otro"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:352
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Otro fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1730
-#: addressbook/gui/widgets/e-addressbook-view.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Buscapersonas"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/contact-editor/e-contact-editor.c:1732
-#: addressbook/gui/widgets/e-addressbook-view.c:354
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1733
-#: addressbook/gui/widgets/e-addressbook-view.c:355
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.c:359
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
 #: addressbook/gui/contact-editor/e-contact-editor.c:1759
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Correo electrónico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
 #: addressbook/gui/contact-editor/e-contact-editor.c:1760
-#: addressbook/gui/widgets/e-addressbook-view.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Correo electrónico 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:360
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Web Site"
 msgstr "Sitio Web"
 
@@ -222,7 +222,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:361
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Department"
 msgstr "Departamento"
 
@@ -231,7 +231,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Office"
 msgstr "Oficina"
 
@@ -242,12 +242,12 @@ msgstr "Off"
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/music/nautilus-music-view.c:198
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 msgid "Title"
 msgstr "Título"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:364
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Profession"
 msgstr "Profesión"
 
@@ -256,7 +256,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Manager"
 msgstr "Gestor"
 
@@ -269,7 +269,7 @@ msgid "Ass"
 msgstr "Asist"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:367
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Nickname"
 msgstr "Nick"
 
@@ -278,12 +278,12 @@ msgid "Nick"
 msgstr "Nick"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:368
+#: addressbook/gui/widgets/e-addressbook-view.c:371
 msgid "Spouse"
 msgstr "Cónyuge"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:369
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 msgid "Note"
 msgstr "Nota"
 
@@ -296,7 +296,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/widgets/e-addressbook-view.c:373
 msgid "Free-busy URL"
 msgstr "URL de disponibilidad"
 
@@ -330,11 +330,11 @@ msgstr "Apellido"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "VCards múltiples"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -347,7 +347,7 @@ msgstr "VCard para %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -355,7 +355,7 @@ msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2364
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Buscando..."
 
@@ -368,37 +368,35 @@ msgstr "Cargando..."
 msgid "Error in search expression."
 msgstr "Error buscando la expresión."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:516
-msgid "Connecting to LDAP server..."
-msgstr "Conectando al servidor LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:526
-msgid "Unable to connect to LDAP server."
-msgstr "No pude conectarme al servidor LDAP."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:542
-msgid "Waiting for connection to LDAP server..."
-msgstr "Esperando la conexión al servidor LDAP..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr "Añadiendo tarjeta al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1174
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2281
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr "Reiniciando búsqueda."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr "Recibiendo los resultados de la búsqueda LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2287
-msgid "Restarting search."
-msgstr "Reiniciando búsqueda."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#, fuzzy
+msgid "Error performing search"
+msgstr "Error eliminando tarjeta"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "No pude analizar la URL `%s'"
 
 #: addressbook/conduit/address-conduit.c:293
 #, fuzzy
@@ -439,423 +437,865 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Un control Bonobo para mostrar una dirección."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-#: notes/GNOME_Evolution_Notes.oaf.in.h:1
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Un control Bonobo de ejemplo que muestra una agenda."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Addressbook Settings"
+msgstr "Fuentes de la agenda de direcciones"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Configuration control for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Control que muestra minitarjetas de direcciones en Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visor de Minitarjetas de Direcciones de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr "Componente de Evolution para manejar contactos."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Factoría para el control de Minitarjetas de Direcciones"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Factoría para el visualizador de direcciones de la Agenda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the Addressbook's address popup"
 msgstr "Factoría para la ventana de direcciones de la Agenda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr "Factoría para el control de ejemplo de la Agenda"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
+msgid "This page can be used to configure Addressbook Settings"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
-#: shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "La carpeta contiene información de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr "El servidor LDAP contiene información de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:558
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Nuevo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:558
-#: ui/evolution-addressbook.xml.h:34
+#: addressbook/gui/component/addressbook-component.c:562
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "Nueva lista de contactos"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Contact _List"
 msgstr "Lista de _contactos"
 
-#: addressbook/gui/component/addressbook-config.c:225
-msgid "Edit Addressbook"
-msgstr "Editar agenda de direcciones"
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr "No se puede inicializar gnome-vfs"
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr "No es posible abrir la agenda de direcciones"
+
+#: addressbook/gui/component/addressbook.c:525
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"No podemos abrir este agenda de direcciones.  Esto significa\n"
+"que ha introducido una URI errónea, o que el servidor LDAP está\n"
+"caído"
+
+#: addressbook/gui/component/addressbook.c:530
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Esta versión de Evolution no implementa LDAP compilado.\n"
+"Si quiere usar LDAP en Evolution debe compilar el programa\n"
+"de las fuentes del CVS una vez que haya obtenido LDAP del\n"
+"siguiente enlace.\n"
+
+#: addressbook/gui/component/addressbook.c:538
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"No pudimos abrir esta agenda de direcciones.  Por favor compruebe\n"
+"que existe la ruta y que tiene permisos para acceder a ella."
+
+#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Introduzca la contraseña para %s (usuario %s)"
+
+#: addressbook/gui/component/addressbook.c:769
+#, fuzzy
+msgid "Name begins with"
+msgstr "finaliza con"
+
+#: addressbook/gui/component/addressbook.c:770
+#, fuzzy
+msgid "Email is"
+msgstr "Correo electrónico 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Categoría es"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Cualquier campo contiene"
+
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+msgid "Advanced..."
+msgstr "Avanzado..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr "Cualquier categoría"
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+msgstr "La URI que mostrará el visor de carpetas"
+
+#: addressbook/gui/component/e-address-popup.c:474
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+msgid "Primary Email"
+msgstr "Correo electrónico principal"
+
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr "Elija un archivo"
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crear nuevo contacto «%s»"
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Añadir dirección al contacto existente «%s»"
+
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
+msgstr "Consultando la Agenda de Direcciones..."
+
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr "Editar información de contacto"
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr "Añadir a Contactos"
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr "Fusionar Direcciones de Correo"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr "Deshabilitar Consultas"
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Enable Queries (Dangerous!)"
+msgstr "Habilitar Consultas (¡Peligroso!)"
+
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "No pude conectarme al servidor LDAP."
+
+#: addressbook/gui/component/addressbook-config.c:215
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"No pude autenticarme en el servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:235
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:641
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1143
+msgid "The server did not respond with a schema entry"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1163
+#, fuzzy
+msgid "Could not query for schema information"
+msgstr ""
+"Información opaca de seguimiento inválida:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1169
+#, 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:1613
+#, 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-config.c:1689
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Fecha de vencimiento"
+
+#: addressbook/gui/component/ldap-config.glade.h:1
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr "_Comprobar tipos soportados "
+
+#: addressbook/gui/component/ldap-config.glade.h:2
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opciones"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Quitar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "100"
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "1234"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#, fuzzy
-msgid "A_uthenticate with server using:"
-msgstr "Autenticación requerida"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Nombre de la cuenta"
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Añadir agenda de direcciones"
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr "Fuentes de la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Avanzado"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Alarmas"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anónimo"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-properties-window.c:1031
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Básico"
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"Congratulations, you are finished setting up this LDAP server. You\n"
+"are now ready to access this directory.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "Conectica"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
-msgid "Check this if the server requires you to authenticate."
-msgstr "_Mi servidor requiere autenticación"
+msgid "DN Customization"
+msgstr "Sin información"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr "Bo_rrar"
 
 # src/nautilus-first-time-druid.c:290
-#: addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
-msgid "Distinguished name (DN)"
+msgid "Distinguished _name:"
 msgstr "Distinguido"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
-msgid "Email address"
-msgstr "Dirección de correo:"
+msgid "Email Address:"
+msgstr "Dir_ección de correo:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
+msgid "Evolution Attribute"
+msgstr "Alarma de Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution usará esta dirección de correo para autenticarte contra el servidor"
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution usará esta dirección de correo para autenticarte contra el servidor"
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "Bus_car"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "General"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Configuración"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Márgenes"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_cada"
+
+#: addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(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."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:41
+msgid "Objectclasses"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:42
+msgid "Objectclasses Used in Evolution:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "One"
 msgstr "Uno"
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "Base de _búsqueda:"
+#: addressbook/gui/component/ldap-config.glade.h:45
+msgid ""
+"Please select and Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
+msgid "R_estore Defaults"
+msgstr "Predeterminados"
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Predeterminados"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
 msgstr "Rango de bú_squeda: "
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Nombre del servidor"
+#. 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
+msgid "Searching"
+msgstr "Buscando"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Seleccionar todo"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Borrado"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
+"your LDAP server supports SSL or TLS."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:55
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:59
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:62
+msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:64
+msgid ""
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "Información de la Fuente"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Conectando al servidor..."
+
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "Step 3: Searching the Directory"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid "Step 4: Display Name"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Se requiere la información de debajo para añadir una agenda.  "
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Schema no soportado"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
+#: 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"
+"information. Please ask your system administrator if you are unsure of this "
+"information."
 msgstr ""
-"Esta información no es requerida por la mayoría de los servidores LDAP."
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
-"This information is used by your ldap server to specify which nodes are used "
-"in a search. Contact your server administrator for more information."
+"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 ""
-"Esta información la usa su servidor LDAP para especificar que nodos son "
-"usados en una búsqueda. Para más información contacte con el administrador "
-"del servidor."
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
 msgstr ""
-"Este es el nodo base de todas sus búsquedas en el servidor LDAP. Para más "
-"información contacte con el administrador del servidor."
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:78
 msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+"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"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base."
 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/addressbook-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:81
 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 assistant will help you to access online directory services\n"
+"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"\n"
+"Adding a new LDAP server requires some specialized information\n"
+"about the server. Please contact your system administrator if you \n"
+"need help finding this information."
 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 servidor ldap."
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Este es el nombre del servidor donde está su agenda."
+#: addressbook/gui/component/ldap-config.glade.h:87
+msgid ""
+"This is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "Este es el puerto que usa su servidor LDAP."
+#: 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."
+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."
+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 "
+"servidor ldap."
 
-#: addressbook/gui/component/addressbook-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
 msgstr ""
 "Este nombre será usado para identificar su cuenta, Es solo para poder "
 "mostrarlo en pantalla."
 
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "Nombre de la cuent_a:"
+#: 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"
+"what port you should specify."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:97
+msgid ""
+"To add an attribute to the DN, select it from the list and click the \"Add "
+"Attribute\" button.\n"
+"Any values that you add to the DN will become required values for any new "
+"contacts\n"
+"that you add to the directory on the LDAP server. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:100
+msgid "U_se SSL/TLS:"
+msgstr ""
+
+# src/nautilus-first-time-druid.c:290
+#: addressbook/gui/component/ldap-config.glade.h:101
+#, fuzzy
+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:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+msgid "Whenever Possible"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:104
 #: 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:100
+#: mail/mail-config.glade.h:139
 msgid "_Add"
 msgstr "_Añadir"
 
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Añadir"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Añadir acción"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Añadir acción"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Alarmas"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Borrar todo"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Mostrar"
+
 # src/nautilus-first-time-druid.c:290
-#: addressbook/gui/component/addressbook-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:111
 #, fuzzy
-msgid "_Distinguished Name:"
+msgid "_Distinguished Name (DN):"
 msgstr "Distinguido"
 
-#: addressbook/gui/component/addressbook-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:113
 #, fuzzy
-msgid "_Download Limit"
+msgid "_Download limit:"
 msgstr "Descargar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-undo-signal-handlers.c:174
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:109
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:39
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: 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:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:115
 #, fuzzy
-msgid "_Email address:"
-msgstr "Dir_ección de correo:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Puerto:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Nombre del _servidor:"
-
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
-msgstr "No se puede inicializar gnome-vfs"
-
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "Otros contactos"
+msgid "_Edit Mapping"
+msgstr "_Editar cita"
 
-#: addressbook/gui/component/addressbook.c:525
-msgid "Unable to open addressbook"
-msgstr "No es posible abrir la agenda de direcciones"
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Alarma de Evolution"
 
-#: addressbook/gui/component/addressbook.c:534
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
-"No podemos abrir este agenda de direcciones.  Esto significa\n"
-"que ha introducido una URI errónea, o que el servidor LDAP está\n"
-"caído"
 
-#: addressbook/gui/component/addressbook.c:539
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
-"Esta versión de Evolution no implementa LDAP compilado.\n"
-"Si quiere usar LDAP en Evolution debe compilar el programa\n"
-"de las fuentes del CVS una vez que haya obtenido LDAP del\n"
-"siguiente enlace.\n"
 
-#: addressbook/gui/component/addressbook.c:547
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
 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:655
-#: addressbook/gui/component/addressbook.c:658
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Introduzca la contraseña para %s (usuario %s)"
 
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Cualquier campo contiene"
-
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "El nombre contiene"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "El mensaje contiene"
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Opciones"
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
-msgstr "Categoría es"
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Puerto:"
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Avanzado..."
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Predeterminados"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1082
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
-msgstr "Cualquier categoría"
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Base de _búsqueda:"
 
-#: addressbook/gui/component/addressbook.c:1167
-msgid "The URI that the Folder Browser will display"
-msgstr "La URI que mostrará el visor de carpetas"
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Nombre del _servidor:"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/sample/nautilus-sample-content-view.c:85
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(ninguno)"
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Tiempo de recordatorio (minutos)"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
-msgid "Primary Email"
-msgstr "Correo electrónico principal"
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Cuenta %d"
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
-msgstr "Elija un archivo"
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "editor-de-listas-de-contactos"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Crear nuevo contacto «%s»"
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Sin tarjetas"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Añadir dirección al contacto existente «%s»"
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Reconectar a %s"
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
-msgstr "Consultando la Agenda de Direcciones..."
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
-msgstr "Editar información de contacto"
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
-msgstr "Añadir a Contactos"
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "General"
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
-msgstr "Fusionar Direcciones de Correo"
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
-msgstr "Deshabilitar Consultas"
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
-msgstr "Habilitar Consultas (¡Peligroso!)"
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "Buscando"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
@@ -868,7 +1308,7 @@ msgstr "Factoría para la interfaz de selección de nombre de la Agenda"
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:849
+#: 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 shell/e-shortcuts-view.c:180
 msgid "Remove"
@@ -900,6 +1340,11 @@ msgid "Unnamed Contact"
 msgstr "Contactos sin nombre"
 
 #: addressbook/gui/component/select-names/e-select-names.c:600
+#, 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"
@@ -914,7 +1359,7 @@ msgstr ""
 "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:608
+#: 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"
@@ -926,31 +1371,40 @@ msgstr ""
 "Puede que necesites salir y reiniciar Evolution para arreglar\n"
 "este problema."
 
-#: addressbook/gui/component/select-names/e-select-names.c:690
+#: 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 "C_ontaining:"
-msgstr "C_onteniendo:"
+msgid "Select Names"
+msgstr "_Seleccionar nombres"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "Bus_car"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "¿Borrar contacto?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "_Seleccionar nombres"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Contactos"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Mostrar contactos que concuerden con el siguiente criterio:"
+msgid ""
+"Type a name into the entry, or\n"
+"select one from the list below:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: 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:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Carpeta:"
 
@@ -1011,10 +1465,6 @@ msgstr "Archivar c_omo:"
 msgid "Full _Name..."
 msgstr "_Nombre completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "General"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1059,10 +1509,11 @@ 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:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1492 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:35
+#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
+#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -2118,14 +2569,6 @@ msgid "Zimbabwe"
 msgstr "Zimbiabue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"¿Esta seguro que quiere\n"
-"borrar este contacto?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "¿Borrar contacto?"
 
@@ -2159,7 +2602,7 @@ msgid "Edit Full"
 msgstr "Editar Todo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:333
+#: addressbook/gui/widgets/e-addressbook-view.c:336
 msgid "Full Name"
 msgstr "Nombre Completo"
 
@@ -2365,7 +2808,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:238
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
@@ -2378,106 +2821,24 @@ msgstr "Búsqueda avanzada"
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:136
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Sin tarjetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:139
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d tarjetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:369
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Error al configurar el propietario"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:313
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-#: addressbook/gui/widgets/e-addressbook-view.c:1646
-#: ui/evolution-addressbook.xml.h:22
-msgid "Save as VCard"
-msgstr "Guardar como VCard"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:2114
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:312
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Abrir"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-#: ui/evolution-addressbook.xml.h:13
-msgid "Forward Contact"
-msgstr "Reenviar contacto"
-
-#
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
-msgid "Send Message to Contact"
-msgstr "Enviar un mensaje al contacto"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1027
-#: ui/evolution-addressbook.xml.h:19 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "Imprimir"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
-msgid "Print Envelope"
-msgstr "Imprimir cabecera"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:322
-#: addressbook/gui/widgets/e-addressbook-view.c:1033
-#, fuzzy
-msgid "Copy to folder..."
-msgstr "_Copiar a la carpeta..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1034
-#, fuzzy
-msgid "Move to folder..."
-msgstr "_Mover a la carpeta..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:1037
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Cortar"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1038
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:7
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Copiar"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:1039
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:12
-msgid "Paste"
-msgstr "Pegar"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:1865
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1040 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:295 ui/evolution-addressbook.xml.h:10
-#: 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:19
-msgid "Delete"
-msgstr "Suprimir"
-
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
 #: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
@@ -2485,14 +2846,15 @@ msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1020
+#: shell/evolution-shell-component.c:1043
 msgid "Success"
 msgstr "Éxito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1941
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: camel/providers/imap/camel-imap-command.c:363
+#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2500,8 +2862,8 @@ msgstr "Error desconocido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:1048
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
+#: shell/evolution-shell-component.c:1071
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2519,9 +2881,9 @@ 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/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
+#: camel/camel-service.c:653 camel/camel-service.c:721
+#: camel/camel-service.c:764
 msgid "Cancelled"
 msgstr "Cancelar"
 
@@ -2553,7 +2915,7 @@ msgstr "Error eliminando lista"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:97
 #: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
@@ -2579,86 +2941,191 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:342
+#: addressbook/gui/widgets/e-addressbook-util.c:344
 msgid "Move card to"
 msgstr "Mover tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:346
 msgid "Copy card to"
 msgstr "Copiar tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Move cards to"
 msgstr "Mover tarjetas a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:351
 msgid "Copy cards to"
 msgstr "Copiar tarjetas a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aquí para añadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Teléfono principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Teléfono del asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Teléfono del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Teléfono para rellamadas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Teléfono de la compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Dirección del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Dirección de su casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Teléfono del coche"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Teléfono del trabajo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Teléfono de casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Otro teléfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Other Address"
 msgstr "Otra dirección"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Guardar como VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Nuevo contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Nueva lista de contactos"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Ir a la carpeta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "_Importar..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "Bu_scar contactos"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Fuentes de la _Agenda..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Configuración del pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Reenviar contacto"
+
+#
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr "Enviar un mensaje al contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: 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/my-evolution.xml.h:1
+msgid "Print"
+msgstr "Imprimir"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+msgid "Print Envelope"
+msgstr "Imprimir cabecera"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "_Copiar a la carpeta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_Mover a la carpeta..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Copiar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: ui/evolution-addressbook.xml.h:15 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:904 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
+#: 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:907
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Vista actual"
+
+#. Minicard view stuff
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/gui/widgets/e-addressbook-view.c:940
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,ñ,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -2666,7 +3133,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,ñ,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,ñ,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -2683,7 +3150,7 @@ msgstr "y una tarjeta más."
 msgid "Save in addressbook"
 msgstr "Guardar en la agenda de direcciones"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2697,7 +3164,7 @@ msgstr ""
 "\n"
 "Pulse dos veces aquí para crear un nuevo contacto."
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -2796,6 +3263,7 @@ msgid "Include:"
 msgstr "Incluye:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Horizontal"
 
@@ -2820,6 +3288,7 @@ msgid "Options"
 msgstr "Opciones"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Orientación"
 
@@ -2840,7 +3309,9 @@ msgstr "Papel"
 msgid "Paper source:"
 msgstr "Fuente del papel:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Vertical"
 
@@ -2904,29 +3375,25 @@ msgstr "_Tipo de letra..."
 msgid "Untitled appointment"
 msgstr "Cita sin título"
 
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:653
+#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
 msgid "High"
 msgstr "Alta"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: 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:407 mail/message-list.c:652
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:651
+#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
 msgid "Low"
 msgstr "Baja"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:518
+#: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:409
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -2958,42 +3425,56 @@ 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"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Factoría para el compositor de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution calendar executive summary component."
 msgstr "Componente de resumen de trabajo de Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Visor del calendario iTip/iMip de Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Componente de Evolution para manejar el calendario."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the Calendar Summary component."
 msgstr "Factoría para el componente de Resumen de Calendario."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Factoría para el control de tareas de Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "Factoría para el control de vista de calendario iTip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Factoría para el control del Calendario de ejemplo"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 "Factoría para centralizar el componente del editor de diálogos del calendario"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "Factoría para crear el componente del editor"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+msgid "This page can be used to configure Calendar and Task preferences"
+msgstr ""
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Servicio de notificación de alarmas"
@@ -3002,22 +3483,10 @@ msgstr "Servicio de notificación de alarmas"
 msgid "Factory for the alarm notification service"
 msgstr "Factoría para la alarma del servicio de notificación"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
-msgstr "Comenzando:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr "Finalizando:"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "tiempo no válido"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Alarma de Evolution"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3057,7 +3526,7 @@ msgstr ""
 "Evolution mostrará un diálogo de recordatorio normal."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:429 mail/mail-callbacks.c:2573
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
@@ -3083,7 +3552,7 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "No se puede inicializar GNOME"
 
@@ -3095,67 +3564,65 @@ msgstr "No pude crear el servicio de la alarma de notificación"
 msgid "Could not create the alarm notify service factory"
 msgstr "No pude crear la factoría del servicio de la alarma de notificación"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:460 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
+#: 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
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:469
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:487
-#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:485
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/calendar-commands.c:834
+#: calendar/gui/calendar-commands.c:800
 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/e-calendar-table.c:385
 msgid "Private"
 msgstr "Privado"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr "Público"
 
@@ -3176,32 +3643,27 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
-#: calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1042
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 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/e-calendar-table.c:479 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Sin comenzar"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "En proceso"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2252
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Completado"
 
@@ -3217,9 +3679,10 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1512
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
+#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
+#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
+#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: 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
@@ -3236,21 +3699,13 @@ msgstr "Asignado"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
-#: calendar/gui/e-meeting-model.c:821
 msgid "Yes"
 msgstr "Si"
 
 #: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
 msgid "No"
 msgstr "No"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-#: calendar/gui/e-week-view.c:1188
-msgid "Searching"
-msgstr "Buscando"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Vista Diaria"
@@ -3267,58 +3722,75 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Carpeta conteniendo citas y eventos"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:250 my-evolution/e-summary-tasks.c:267
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:72 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-shortcuts.c:1039
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tareas"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Carpeta que contiene elementos por hacer"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "New meeting"
 msgstr "Nueva reunión"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:695
 msgid "_Meeting"
 msgstr "_Reunión"
 
-#: calendar/gui/component-factory.c:687
+#: calendar/gui/component-factory.c:699
 msgid "New task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/component-factory.c:687 ui/evolution-tasks.xml.h:21
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Nueva cita"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Cit_a"
+
+#: calendar/gui/component-factory.c:707
 msgid "New appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:707
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: calendar/gui/control-factory.c:103
+#: calendar/gui/control-factory.c:123
+#, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "No puedo abrir la carpeta en '%s'"
 
-#: calendar/gui/control-factory.c:130
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrará el calendario"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "otro enlace hacia %s"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Opciones de las Alarmas Auditivas"
@@ -3364,8 +3836,9 @@ 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:"
@@ -3383,9 +3856,7 @@ msgstr "extra tiempo cada"
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "minutos"
 
@@ -3513,7 +3984,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:758 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -3542,7 +4013,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:131
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -3583,171 +4054,169 @@ msgid "Color for tasks due today"
 msgstr "Color para las tareas para hoy"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Crear una nueva cita con un _recordatorio por defecto"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Días"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Primer día de la se_mana:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Viernes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Lunes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Tareas fuera de pla_zo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Sábado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
 msgstr ""
-"Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Sta_rt of day:"
 msgstr "Co_mienzo del día:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "Do_m"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Ta_reas de plazo hoy:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "Ju_e"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "M_ar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Ta_reas de plazo hoy:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Lista de _Tareas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Thursday"
 msgstr "Jueves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Hora"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Di_visiones de tiempo:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Formato del tiempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1122
 msgid "Tuesday"
 msgstr "Martes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Semana Laboral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ación al borrar elementos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Mostrar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr "Fin d_el día:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Vier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "_General"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas completadas tras"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Otro"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Tareas fuera de pla_zo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Sab"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Lista de _Tareas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr ""
+"Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Di_visiones de tiempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "M_ier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr "antes de comenzar la cita"
 
@@ -3812,73 +4281,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
 msgid " (Completed "
 msgstr "(Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
 msgid "Completed "
 msgstr "Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
 msgid " (Due "
 msgstr " (Falta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
 msgid "Due "
 msgstr "Falta "
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr "¡No pude actualizar el objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2226
-#: mail/mail-display.c:113
-msgid "Overwrite file?"
-msgstr "¿Sobreescribir archivo?"
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2233
-#: mail/mail-display.c:117
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ya existe una archivo con ese nombre.\n"
-"¿Sobreescribirlo?"
-
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
+#: calendar/gui/dialogs/comp-editor.c:1074
+#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+msgid "Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr "¡Imposible obtener versión actual!"
 
@@ -3936,7 +4392,7 @@ msgstr "Delegado A:"
 msgid "Enter Delegate"
 msgstr "Escribir delegado"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Cita"
 
@@ -4003,7 +4459,7 @@ msgid "Pu_blic"
 msgstr "Pú_blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Show Time As"
 msgstr "Mostrar tiempo como"
 
@@ -4048,50 +4504,44 @@ msgstr "Participantes"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Pulse aquí para añadir un contacto"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Nombre común"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Delegated From"
 msgstr "Delegado por"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated To"
 msgstr "Delegado a"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Language"
 msgstr "Idioma"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Member"
 msgstr "Miembro"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:853
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Role"
 msgstr "Papel"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # 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:31
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
 #: mail/message-list.etspec.h:11
 msgid "Status"
 msgstr "Estado"
@@ -4100,9 +4550,9 @@ msgstr "Estado"
 # libnautilus-private/nautilus-search-bar-criterion.c:44
 # src/file-manager/fm-list-view.c:1593
 # src/file-manager/fm-search-list-view.c:152
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:95
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4125,27 +4575,100 @@ msgstr "_Invitar a otros..."
 msgid "_Other Organizer"
 msgstr "_Otro organizador"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: 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"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "3"
+
+#: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:130
+#: calendar/gui/dialogs/recurrence-page.c:131
+#: calendar/gui/dialogs/recurrence-page.c:132
+#: calendar/gui/dialogs/recurrence-page.c:133
+#: calendar/gui/dialogs/recurrence-page.c:134
+#: calendar/gui/dialogs/recurrence-page.c:135
+#: calendar/gui/dialogs/recurrence-page.c:136
+#: calendar/gui/dialogs/recurrence-page.c:137
+#: calendar/gui/dialogs/recurrence-page.c:138
+#: calendar/gui/dialogs/recurrence-page.c:139
+#: calendar/gui/dialogs/recurrence-page.c:140
+#: calendar/gui/dialogs/recurrence-page.c:141
+#: calendar/gui/dialogs/recurrence-page.c:142
+#: calendar/gui/dialogs/recurrence-page.c:143
+#: calendar/gui/dialogs/recurrence-page.c:144
+#: calendar/gui/dialogs/recurrence-page.c:145
+#: calendar/gui/dialogs/recurrence-page.c:149
+#: calendar/gui/dialogs/recurrence-page.c:150
+#: calendar/gui/dialogs/recurrence-page.c:151
+#: calendar/gui/dialogs/recurrence-page.c:152
+#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:154
+#: calendar/gui/dialogs/recurrence-page.c:155
+msgid "th"
+msgstr "º"
+
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "lista"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+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"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Norte"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "lista"
+
+#: 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
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr "º"
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "ocurrencias"
 
@@ -4242,7 +4765,7 @@ msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4254,15 +4777,21 @@ msgstr "_Prioridad:"
 msgid "_Status:"
 msgstr "E_stado:"
 
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/fm-properties-window.c:1031
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Básico"
+
 #: calendar/gui/dialogs/task-editor.c:190
 #: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:325
+#: calendar/gui/dialogs/task-editor.c:324
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:801
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:32
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Descripción:"
 
@@ -4274,118 +4803,82 @@ msgstr "Fecha de Ini_cio:"
 msgid "_Due Date:"
 msgstr "Fecha _de Fin:"
 
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:438
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1828
+#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
 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:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3433 mail/folder-browser.c:1463
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
+#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3442 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Guardar como..."
+
+#: calendar/gui/e-calendar-table.c:974 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
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+msgid "_Print..."
+msgstr "Im_primir..."
+
+#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-week-view.c:3478 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:966 calendar/gui/e-day-view.c:3557
-#: calendar/gui/e-week-view.c:3444 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: 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:968 calendar/gui/e-day-view.c:3532
-#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3420
-#: calendar/gui/e-week-view.c:3446 ui/evolution-addressbook.xml.h:42
-#: ui/evolution-calendar.xml.h:41 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:980 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
+#: 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:973
+#: calendar/gui/e-calendar-table.c:984
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Asignar tarea"
+
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Reenviar como i_Calendar"
+
+#: calendar/gui/e-calendar-table.c:986
 msgid "_Mark as Complete"
 msgstr "_Marcar como completo"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "_Borrar esta tarea"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:992
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7140
-#: calendar/gui/e-week-view.c:3930
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1247
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
 
@@ -4393,48 +4886,47 @@ msgstr "Pulse para añadir una tarea"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr "Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Fecha de vencimiento"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Fecha de plazo"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Fecha fin"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Posición geográfica"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Prioridad"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 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:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1498 shell/e-summary-storage.c:79
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Resumen"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4468,418 +4960,178 @@ 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:1389
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413
+#: 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:1416
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
 #: 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:614 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:768
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:770
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Nueva cit_a"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3415
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el día"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3425
-#: ui/evolution-calendar.xml.h:19
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#, fuzzy
+msgid "New Meeting"
+msgstr "Nueva reunión"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#, fuzzy
+msgid "New Task"
+msgstr "Nueva tarea"
+
+#: calendar/gui/e-day-view.c:3560 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
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3427
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3435
-msgid "_Delete this Appointment"
-msgstr "_Borrar esta cita"
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: 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:37
+#, fuzzy
+msgid "_Configure..."
+msgstr "Configurar"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+msgid "_Configure Pilot..."
+msgstr "Configurar"
+
+#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
+#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+msgid "_Save As..."
+msgstr "Guardar _como..."
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Concertar un _encuentro"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Reenviar como i_Calendar"
+
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3462
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3464
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
-#: calendar/gui/e-itip-control.c:545
-msgid "Meeting begins: <b>"
-msgstr "La reunión empieza: <b>"
-
-#: calendar/gui/e-itip-control.c:550
-msgid "Task begins: <b>"
-msgstr "La tarea empieza: <b>"
-
-#: calendar/gui/e-itip-control.c:555
-msgid "Free/Busy info begins: <b>"
-msgstr "La información de disponibilidad comienza: <b>"
-
-#: calendar/gui/e-itip-control.c:559
-msgid "Begins: <b>"
-msgstr "Empieza: <b>"
-
-#: calendar/gui/e-itip-control.c:571
-msgid "Meeting ends: <b>"
-msgstr "La reunión termina: <b>"
-
-#: calendar/gui/e-itip-control.c:574
-msgid "Free/Busy info ends: <b>"
-msgstr "La información de disponibilidad finaliza: <b>"
-
-#: calendar/gui/e-itip-control.c:578
-msgid "Ends: <b>"
-msgstr "Termina: <b>"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Completed: <b>"
-msgstr "Tarea completada: <b>"
-
-#: calendar/gui/e-itip-control.c:602
-msgid "Task Due: <b>"
-msgstr "Plazo para la tarea: <b>"
-
-#: calendar/gui/e-itip-control.c:639 calendar/gui/e-itip-control.c:688
-msgid "iCalendar Information"
-msgstr "Información del calendario"
-
-#. Title
-#: calendar/gui/e-itip-control.c:654
-msgid "iCalendar Error"
-msgstr "Error de calendario"
-
-#: calendar/gui/e-itip-control.c:719 calendar/gui/e-itip-control.c:735
-msgid "An unknown person"
-msgstr "Una persona desconocida"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:742
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Por favor revise la siguiente información, y seleccione una acción del "
-"menú de abajo."
-
-#: calendar/gui/e-itip-control.c:758
-msgid "<i>None</i>"
-msgstr "<i>Ninguna<i>"
-
-#: calendar/gui/e-itip-control.c:770
-#, fuzzy
-msgid "Status:"
-msgstr "E_stado:"
-
-#: calendar/gui/e-itip-control.c:775 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
-msgid "Accepted"
-msgstr "Aceptado"
-
-#: calendar/gui/e-itip-control.c:779
-#, fuzzy
-msgid "Tentatively Accepted"
-msgstr "Aceptar tentativamente"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+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-itip-control.c:783 calendar/gui/e-meeting-model.c:320
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
-msgid "Declined"
-msgstr "Rechazado"
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
+#, c-format
+msgid "Error executing %s."
+msgstr "Error ejecutando %s."
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-file.c:2936
-#: calendar/gui/e-itip-control.c:787 calendar/gui/e-itip-control.c:986
-#: calendar/gui/e-itip-control.c:1057 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
-#: camel/providers/smtp/camel-smtp-transport.c:171
-#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:317
-#: mail/mail-display.c:817 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:442
+#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
+#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:849
-#: calendar/gui/e-itip-control.c:865 calendar/gui/e-itip-control.c:878
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.c:904
-msgid "Choose an action:"
-msgstr "Elija una acción:"
-
-#: calendar/gui/e-itip-control.c:834
-msgid "Update"
-msgstr "Actualizar"
-
-#: calendar/gui/e-itip-control.c:835 calendar/gui/e-itip-control.c:854
-#: calendar/gui/e-itip-control.c:867 calendar/gui/e-itip-control.c:880
-#: calendar/gui/e-itip-control.c:893 calendar/gui/e-itip-control.c:906
-#: shell/e-shell.c:1931 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Aceptar"
-
-#: calendar/gui/e-itip-control.c:850
-msgid "Accept"
-msgstr "Aceptar"
-
-#: calendar/gui/e-itip-control.c:851
-msgid "Tentatively accept"
-msgstr "Aceptar tentativamente"
-
-#: calendar/gui/e-itip-control.c:852
-msgid "Decline"
-msgstr "Rechazar"
-
-#: calendar/gui/e-itip-control.c:866
-msgid "Send Free/Busy Information"
-msgstr "Enviar información de disponibilidad"
-
-#: calendar/gui/e-itip-control.c:879
-msgid "Update respondent status"
-msgstr "Actualizar el estado del remitente"
-
-#: calendar/gui/e-itip-control.c:892
-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:905 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: calendar/gui/e-itip-control.c:953
-#, 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:954
-msgid "Meeting Information"
-msgstr "Información  de reuniones"
-
-#: calendar/gui/e-itip-control.c:958
-#, 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:959
-msgid "Meeting Proposal"
-msgstr "Propuesta de reunión"
-
-#: calendar/gui/e-itip-control.c:963
-#, 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:964
-msgid "Meeting Update"
-msgstr "Actualización de la reunión"
-
-#: calendar/gui/e-itip-control.c:968
-#, 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:969
-msgid "Meeting Update Request"
-msgstr "Petición de actualización de la reunión"
-
-#: calendar/gui/e-itip-control.c:992
-#, 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:993
-msgid "Meeting Reply"
-msgstr "Respuesta de reunión"
-
-#: calendar/gui/e-itip-control.c:997
-#, 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:998
-msgid "Meeting Cancellation"
-msgstr "Cancelación de reunión"
-
-#: calendar/gui/e-itip-control.c:1002 calendar/gui/e-itip-control.c:1073
-#: calendar/gui/e-itip-control.c:1108
-#, 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:1003
-msgid "Bad Meeting Message"
-msgstr "Mensaje de reunión erróneo"
-
-#: calendar/gui/e-itip-control.c:1023
-#, 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:1024
-msgid "Task Information"
-msgstr "Información de la tarea"
-
-#: calendar/gui/e-itip-control.c:1028
-#, 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:1029
-msgid "Task Proposal"
-msgstr "Propuesta de tarea"
-
-#: calendar/gui/e-itip-control.c:1033
-#, 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:1034
-msgid "Task Update"
-msgstr "Actualización de tarea"
-
-#: calendar/gui/e-itip-control.c:1038
-#, 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:1039
-msgid "Task Update Request"
-msgstr "Petición de actualización de tarea"
-
-#: calendar/gui/e-itip-control.c:1063
-#, 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:1064
-msgid "Task Reply"
-msgstr "Respuesta a una tarea"
-
-#: calendar/gui/e-itip-control.c:1068
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> ha cancelado una tarea."
-
-#: calendar/gui/e-itip-control.c:1069
-msgid "Task Cancellation"
-msgstr "Cancelación de tarea"
-
-#: calendar/gui/e-itip-control.c:1074
-msgid "Bad Task Message"
-msgstr "Mensaje de tarea erróneo"
-
-#: calendar/gui/e-itip-control.c:1093
-#, 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:1094
-msgid "Free/Busy Information"
-msgstr "Información de disponibilidad"
-
-#: calendar/gui/e-itip-control.c:1098
-#, 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:1099
-msgid "Free/Busy Request"
-msgstr "Petición de disponibilidad"
-
-#: calendar/gui/e-itip-control.c:1103
-#, 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:1104
-msgid "Free/Busy Reply"
-msgstr "Respuesta sobre disponibilidad"
-
-#: calendar/gui/e-itip-control.c:1109
-msgid "Bad Free/Busy Message"
-msgstr "Mensaje de disponibilidad erróneo"
-
-#: calendar/gui/e-itip-control.c:1182
-msgid "The message does not appear to be properly formed"
-msgstr "Parece que el mensaje no está bien construido"
-
-#: calendar/gui/e-itip-control.c:1201
-msgid "The message contains only unsupported requests."
-msgstr "Este mensaje solo contiene peticiones no soportadas."
-
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1235
-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:1260
-msgid "The attachment has no viewable calendar items"
-msgstr "El adjunto no tiene elementos de calendario visibles"
-
-#: calendar/gui/e-itip-control.c:1338
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
-"¡No pude encontrar ninguna de tus identidades en la lista de participantes!\n"
-
-#: calendar/gui/e-itip-control.c:1369
+#: calendar/gui/e-itip-control.c:1564
 msgid "Calendar file could not be updated!\n"
 msgstr "¡El archivo del calendario no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1371
+#: calendar/gui/e-itip-control.c:1566
 msgid "Update complete\n"
 msgstr "Actualización completada\n"
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+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:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1625
 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:1424
+#: calendar/gui/e-itip-control.c:1638
 msgid "Attendee status could not be updated!\n"
 msgstr "¡El estado de asistencia no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1426
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1428
-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:1456
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr "Borrado completo"
 
-#: calendar/gui/e-itip-control.c:1486 calendar/gui/e-itip-control.c:1536
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr "¡Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1488 calendar/gui/e-itip-control.c:1540
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr "¡El elemento no puedo ser enviado!\n"
 
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Seleccionar carpeta"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Seleccionar carpeta"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4921,7 +5173,7 @@ msgstr "fecha de inicio"
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1640
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
@@ -4934,57 +5186,58 @@ msgid "Non-Participants"
 msgstr "No participan"
 
 #: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533 calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Individual"
 
 #: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
 msgid "Group"
 msgstr "Grupo"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
 msgid "Resource"
 msgstr "Recurso"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
 msgid "Room"
 msgstr "Habitación"
 
 #: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
 msgid "Chair"
 msgstr "Silla"
 
 #: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr "Participantes requeridos"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:807
 msgid "Optional Participant"
 msgstr "Participantes opcional"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:808
 msgid "Non-Participant"
 msgstr "No participan"
 
 #: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543 calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:543
 msgid "Needs Action"
 msgstr "Necesita acción"
 
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+msgid "Accepted"
+msgstr "Aceptado"
+
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+msgid "Declined"
+msgstr "Rechazado"
+
 #: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr "Tentativa"
 
 #: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -4994,14 +5247,14 @@ msgstr "En proceso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:471
+#: calendar/gui/e-meeting-time-sel-item.c:475
 #: calendar/gui/e-meeting-time-sel.c:2088
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel-item.c:479
 #: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
@@ -5009,7 +5262,7 @@ msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
 #: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
@@ -5074,41 +5327,55 @@ msgstr "Hora de _inicio de la reunión:"
 msgid "Meeting _end time:"
 msgstr "Hora de _fin de la reunión:"
 
-#: calendar/gui/e-tasks.c:351
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tarea en %s"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:186
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No puedo cargar las tareas en `%s'"
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El método necesario para cargar `%s' no está implementado"
 
-#: calendar/gui/e-tasks.c:643
+#: calendar/gui/e-tasks.c:543
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Fecha de vencimiento"
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Borrando los objetos seleccionados"
+
+#: calendar/gui/e-tasks.c:659
 #, fuzzy
 msgid "Expunging"
 msgstr "Comprimiendo carpeta"
 
-#: calendar/gui/e-week-view.c:3413 calendar/gui/e-week-view.c:3451
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Nueva cit_a..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "_Borrar esta cita"
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El método necesario para abrir `%s' no está implementado"
 
-#: calendar/gui/gnome-cal.c:1872
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abriendo calendario en %s"
@@ -5169,284 +5436,223 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un asistente"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:346
-msgid "Event information"
-msgstr "Información del evento"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:348
-msgid "Task information"
-msgstr "Información de la tarea"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:350
-msgid "Journal information"
-msgstr "Información de la entrada de diario"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:367
-msgid "Free/Busy information"
-msgstr "Información de disponibilidad"
-
-#: calendar/gui/itip-utils.c:321
-msgid "Calendar information"
-msgstr "Información del calendario"
-
-#: calendar/gui/itip-utils.c:361
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Información de disponibilidad (de %s a %s)"
-
-#: calendar/gui/itip-utils.c:373
-msgid "iCalendar information"
-msgstr "Información de iCalendar"
-
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Debes participar en el evento."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr "No pude crear la factoría del componente editor"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Lun"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Mar"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Miér"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Jue"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Vier"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Sab"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Día seleccionado (%a %d de %b de %Y)"
 
-#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
+#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
 msgid "%a %b %d"
 msgstr "%a %d de %b"
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1852
+#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
+#: calendar/gui/print.c:1896
 msgid "%a %b %d %Y"
 msgstr "%a %d de %b de %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Año seleccionado (%Y)"
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Tarea"
-
-#: calendar/gui/print.c:2262
-#, c-format
-msgid "Status: %s"
-msgstr "Estado: %s"
-
-#: calendar/gui/print.c:2280
-#, c-format
-msgid "Priority: %s"
-msgstr "Prioridad: %s"
-
-#: calendar/gui/print.c:2294
-#, c-format
-msgid "Percent Complete: %i"
-msgstr "Porcentaje Completado: %i"
-
-#: calendar/gui/print.c:2306
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: calendar/gui/print.c:2320
-#, c-format
-msgid "Categories: %s"
-msgstr "Categorías: %s"
-
-#: calendar/gui/print.c:2331
-msgid "Contacts: "
-msgstr "Contactos: "
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2882 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-mail-message.xml.h:67
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Configurar impresión"
 
@@ -5456,11 +5662,11 @@ msgid ""
 msgstr ""
 "No pude crear una vista de tareas.  Por favor compruebe su ORBit y su OAF."
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrará la carpeta de tareas"
 
-#: calendar/gui/tasks-control.c:437
+#: calendar/gui/tasks-control.c:456
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -5473,11 +5679,16 @@ msgstr ""
 "\n"
 "¿Borrar realmente esos mensajes?"
 
-#: calendar/gui/tasks-control.c:444 mail/mail-callbacks.c:2359
-#: mail/mail-callbacks.c:2587
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Imprimir tarjetas"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5495,8 +5706,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
@@ -5504,14 +5715,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."
@@ -5535,107 +5746,126 @@ msgstr "Importa archivos VCard a Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa archivos VCard a Evolution."
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Mensaje del Calendario"
+
+#: calendar/importers/icalendar-importer.c:663
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution ha encontrado archivos de correo de Pine.\n"
+"¿Quiere importarlos a Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Agenda"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now espera 0 argumentos"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time espera 1 argumento"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time espera que el argumento 1 sea una cadena"
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "el argumento 1 de make-time debe ser una cadena tipo ISO 8601 hora/fecha"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day espera 2 argumentos"
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day espera que el argumento 2 sea un entero"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin espera 1 argumento"
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end espera 1 argumento"
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype espera 0 argumentos"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? espera 2 argumentos"
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? espera que el argumento 2 sea time_t"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? espera 2 argumentos"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? espera que el argumento 1 sea una cadena"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que el argumento 2 sea una cadena"
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", "
 "\"description\""
 msgstr ""
 "contains? espera que el argumento 1 sea «any», «summary» ó «description»"
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? espera al menos 1 argumento"
 
-#: calendar/pcs/query.c:745
+#: calendar/pcs/query.c:747
 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:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "¿esta completo? espera 0 argumentos"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before espera 1 argumentos"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before espera que el argumento 1 sea time_t"
 
@@ -7177,12 +7407,12 @@ msgstr "El cifrado no está implementada por este cifrado"
 msgid "Decryption is not supported by this cipher"
 msgstr "El descifrado no está implementada por este cifrado"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr "Imposible reemplazar archivo."
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "No puedo abrir directorio de cache: %s"
@@ -7217,52 +7447,51 @@ msgstr "Resincronizando con el servidor"
 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:689 camel/camel-filter-driver.c:698
+#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr "No pude abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr "No pude procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr "No puedo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
@@ -7277,7 +7506,7 @@ msgstr "Error al decodificar el mensaje."
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7286,7 +7515,7 @@ msgstr ""
 "No puedo analizar la expresión de búsqueda %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7295,35 +7524,31 @@ msgstr ""
 "Error ejecutando la búsqueda según la expresión %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
+#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(concordar todas) requiere un único resultado booleano"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Realizando búsqueda en cabecera desconocida: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Tipo inválido en el contenido del cuerpo, esperando una cadena"
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operación no implementada: añadir mensaje: para %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Operación no implementada: búsqueda según la expresión %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Operación no implementada: búsqueda por uids: para %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 msgid "Moving messages"
 msgstr "Moviendo mensajes"
 
@@ -7432,167 +7657,119 @@ msgstr "Por favor introduzca su frase de paso%s %s"
 msgid "Please enter your %s passphrase"
 msgstr "Por favor introduzca su frase de paso %s"
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "No puedo firmar este mensaje: no hay texto plano que firmar"
 
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:763
+#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
 msgid "Cannot sign this message: no password provided"
 msgstr "No puedo firmar este mensaje: no se facilito la contraseña"
 
-#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:769
+#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No puedo firmar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:756
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "No puedo firmar este mensaje: no hay texto plano a firmar en claro"
 
-#: camel/camel-pgp-context.c:955
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "No puedo verificar este mensaje: no texto plano a verificar"
 
-#: camel/camel-pgp-context.c:961
+#: camel/camel-pgp-context.c:993
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No puedo verificar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:972
+#: camel/camel-pgp-context.c:1004
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "No puedo verificar este mensaje: no pude crear archivo temporal: %s"
 
-#: camel/camel-pgp-context.c:1145
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "No puedo cifrar este mensaje: no hay texto plano a cifrar"
 
-#: camel/camel-pgp-context.c:1155
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr "No puedo cifrar este mensaje: no se facilitó la contraseña"
 
-#: camel/camel-pgp-context.c:1162
+#: camel/camel-pgp-context.c:1194
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No puedo cifrar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1171
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "No puedo cifrar este mensaje: no hay destinatarios."
 
-#: camel/camel-pgp-context.c:1340
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "No puedo descifrar este mensaje: no hay texto cifrado a descifrar"
 
-#: camel/camel-pgp-context.c:1348
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr "No puedo descifrar este mensaje: no se facilito la contraseña"
 
-#: camel/camel-pgp-context.c:1355
+#: camel/camel-pgp-context.c:1387
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No puedo descifrar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#: camel/camel-pgp-mime.c:329
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr "Esta parte del mensaje esta firmada digitalmente"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Por favor introduzca su contraseña para %s"
-
-#: camel/camel-pkcs7-context.c:213
-#, fuzzy
-msgid "Error hashing password."
-msgstr "Error añadiendo tarjeta"
-
-#: camel/camel-pkcs7-context.c:222
-#, fuzzy
-msgid "Invalid password."
-msgstr "Argumento inválido"
-
-#: camel/camel-pkcs7-context.c:329
-#, fuzzy, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Error al buscar el certificado para «%s»."
-
-#: camel/camel-pkcs7-context.c:378
-#, fuzzy, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Error al buscar el certificado para «%s»."
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:590
-#, fuzzy
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "No pude crear un contexto de cifrado PGP."
-
-#: camel/camel-pkcs7-context.c:620
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "No pude conectar con el servidor: %s"
-
-#: camel/camel-pkcs7-context.c:626
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "No pude guardar el archivo de firma."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
-#: camel/camel-provider.c:130
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "No pude cargar %s: La carga de módulos no está implementada es este sistema."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "No puedo cargar %s: %s"
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "No pude cagar %s: No hay código de inicialización en el módulo."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s servicio para %s en %s"
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Conexión cancelada"
 
-#: camel/camel-remote-store.c:267
+#: camel/camel-remote-store.c:257 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"
 msgstr "No pude conectar con %s (puerto %d): %s"
 
-#: camel/camel-remote-store.c:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(servidor desconocido)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
+#: camel/camel-remote-store.c:473
 #: camel/providers/imap/camel-imap-command.c:228
 #: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7646,8 +7823,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"
@@ -7655,8 +7832,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."
@@ -7692,8 +7869,7 @@ 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
@@ -7706,7 +7882,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
@@ -7722,9 +7898,20 @@ msgstr "Esta opción conectará con el servidor usando una simple contraseña."
 msgid "Unknown authentication state."
 msgstr "Estado de la autenticación desconocido."
 
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+#, fuzzy
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr "Esta opción conectará con el servidor usando autenticación Kerberos 4."
+
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
+#: camel/providers/nntp/camel-nntp-store.c:153
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Contraseña"
 
@@ -7768,26 +7955,41 @@ msgstr "La URL '%s' necesita un componente de servidor"
 msgid "URL '%s' needs a path component"
 msgstr "La URL '%s' necesita un componente de ruta"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Error al resolver: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Error al resolver: %s: servidor no encontrado"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Error al resolver: %s: razón desconocida"
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Resolviendo: %s"
+
+#: camel/camel-service.c:787
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Error al resolver: %s: servidor no encontrado"
+
+#: camel/camel-service.c:790
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Error al resolver: %s: razón desconocida"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Proveedor de correo de la carpeta virtual"
@@ -7796,12 +7998,12 @@ msgstr "Proveedor de correo de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para leer correo como una búsqueda de otras carpetas"
 
-#: camel/camel-session.c:346 camel/camel-session.c:415
+#: camel/camel-session.c:351 camel/camel-session.c:419
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hay proveedor para el protocolo `%s'"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7810,6 +8012,11 @@ msgstr ""
 "No puedo crear el directorio %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Por favor introduzca su contraseña para %s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Por favor indique el apodo de un certificado con el que firmar."
@@ -7842,15 +8049,15 @@ msgstr "Error al decodificar el mensaje."
 msgid "Failed to verify certificates."
 msgstr "Error al verificar el certificado."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No puedo obtener la carpeta: Operación no válida"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No puedo crear la carpeta: Operación no válida"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -7859,7 +8066,7 @@ msgstr ""
 "Responsable: %s\n"
 "Asunto: %s"
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7876,7 +8083,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7885,17 +8092,17 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 #, fuzzy
 msgid "BAD"
 msgstr "AND"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7920,27 +8127,27 @@ msgstr "No pude analizar la URL `%s'"
 msgid "No such message %s in %s"
 msgstr "No existe el mensaje %s en %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, c-format
 msgid "No such message: %s"
 msgstr "No existe el mensaje: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, 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:293
+#: camel/camel-vee-store.c:297
 #, 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:306
+#: camel/camel-vee-store.c:310
 #, 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:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No pude cambiarle el nombre a la carpeta: %s: No existe"
@@ -7973,52 +8180,52 @@ 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:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 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:466
+#: camel/providers/imap/camel-imap-folder.c:469
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo información de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr "Buscando mensajes nuevos"
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "No puedo abrir directorio de cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:256
-#: camel/providers/imap/camel-imap-message-cache.c:313
-#: camel/providers/imap/camel-imap-message-cache.c:344
-#: camel/providers/imap/camel-imap-message-cache.c:376
+#: 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
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Error al cachear el mensaje %s: %s"
@@ -8031,7 +8238,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:925
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -8061,33 +8268,32 @@ msgid "For reading and storing mail on IMAP servers."
 msgstr "Para leer y guardar correo en los servidores IMAP."
 
 #: 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:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, 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:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr "No escribió una clave."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8098,56 +8304,57 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Para guardar el correo local en directorios del tipo MH."
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Reparto local"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Para obtener el correo local de archivos mbox estándar."
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Aplicar filtros a los mensajes nuevos en el buzón de entrada"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr "Directorios de correo en formato Maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr "Para guardar el correo local en directorios del tipo maildir."
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr "Mbox estándar de Unix"
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Para leer y guardar el correo local en directorios estándar mbox."
 
-#: camel/providers/local/camel-local-provider.c:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8155,56 +8362,62 @@ msgid ""
 "folders first."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:109
+#: camel/providers/local/camel-spoold-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La dirección %s no es absoluta"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s no es un directorio normal"
 
-#: camel/providers/local/camel-local-store.c:153
-#: camel/providers/local/camel-local-store.c:169
-#: camel/providers/local/camel-local-store.c:235
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:236
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No pude acceder a la carpeta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 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:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %s"
 
-#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
 #, 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:374
+#: camel/providers/local/camel-local-store.c:358
+#, 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
 #, 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:384
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No pude borrar el índice de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "No puedo guardar el resumen: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No pude añadir mensajes al resumen: razón desconocida"
 
@@ -8246,7 +8459,7 @@ msgstr "No existe ese mensaje"
 msgid "Invalid message contents"
 msgstr "Contenido inválido en el mensaje"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8256,14 +8469,14 @@ msgstr ""
 "No pude abrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existe."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8273,33 +8486,56 @@ msgstr ""
 "No pude crear la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:131
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' no es un directorio tipo maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No pude borrar la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "no es un directorio tipo maildir"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "No pude analizar la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:405
-#: camel/providers/local/camel-maildir-summary.c:526
+#: camel/providers/local/camel-maildir-summary.c:408
+#: camel/providers/local/camel-maildir-summary.c:531
 #, c-format
 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"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+msgid "Checking for new messages"
+msgstr "Buscando mensajes nuevos"
+
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-mbox-summary.c:250
+#: camel/providers/local/camel-mbox-summary.c:499
+#: camel/providers/local/camel-mbox-summary.c:700
+#: camel/providers/local/camel-spool-summary.c:381
+#: camel/providers/local/camel-spool-summary.c:646
+#: camel/providers/local/camel-spool-summary.c:945
+msgid "Storing folder"
+msgstr "Guardando carpeta"
+
 #: camel/providers/local/camel-mbox-folder.c:151
 #: camel/providers/local/camel-spool-folder.c:277
 #, c-format
@@ -8345,7 +8581,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:93
+#: camel/providers/local/camel-mbox-store.c:95
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -8354,7 +8590,7 @@ msgstr ""
 "No puedo abrir el archivo `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:109
+#: camel/providers/local/camel-mbox-store.c:111
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -8363,14 +8599,14 @@ msgstr ""
 "No pude crear el archivo `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:118
-#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:120
+#: camel/providers/local/camel-mbox-store.c:147
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' no es un archivo normal."
 
-#: camel/providers/local/camel-mbox-store.c:137
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:139
+#: camel/providers/local/camel-mbox-store.c:162
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -8379,96 +8615,85 @@ msgstr ""
 "No pude borrar la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mbox-store.c:154
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no esta vacía. No fue borrada."
 
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
-#: camel/providers/local/camel-mbox-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:378
-#: camel/providers/local/camel-spool-summary.c:643
-#: camel/providers/local/camel-spool-summary.c:935
-msgid "Storing folder"
-msgstr "Guardando carpeta"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "No pude abrir la carpeta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 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:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "No pude comprobar la carpeta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "No pude abrir el archivo %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, 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:544
-#: camel/providers/local/camel-mbox-summary.c:552
-#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:749
-#: camel/providers/local/camel-spool-summary.c:697
-#: camel/providers/local/camel-spool-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:978
-#: camel/providers/local/camel-spool-summary.c:986
+#: camel/providers/local/camel-mbox-summary.c:546
+#: camel/providers/local/camel-mbox-summary.c:554
+#: camel/providers/local/camel-mbox-summary.c:743
+#: camel/providers/local/camel-mbox-summary.c:751
+#: camel/providers/local/camel-spool-summary.c:700
+#: camel/providers/local/camel-spool-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:988
+#: camel/providers/local/camel-spool-summary.c:996
 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:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: camel/providers/local/camel-mbox-summary.c:597
+#: camel/providers/local/camel-spool-summary.c:752
 #, 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:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: camel/providers/local/camel-mbox-summary.c:614
+#: camel/providers/local/camel-spool-summary.c:774
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error la escribir al archivo temporal: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:801
+#: camel/providers/local/camel-spool-summary.c:1046
 #, 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:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No pude cerrar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, 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:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
@@ -8488,7 +8713,7 @@ msgstr "No pude añadir el mensaje a la carpeta mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' no es un directorio."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "No puedo abrir el directorio MH en la ruta: %s: %s"
@@ -8504,6 +8729,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' no existe o no es un archivo normal."
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s/%s' no existe."
@@ -8513,29 +8739,31 @@ msgstr "La carpeta `%s/%s' no existe."
 msgid "Spool mail file %s"
 msgstr "Archivo de cola de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr "Las carpetas de correo no pueden ser renombradas"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr "Las carpetas de correo no pueden ser borradas"
 
-#: camel/providers/local/camel-spool-summary.c:788
-#: camel/providers/local/camel-spool-summary.c:797
-#: camel/providers/local/camel-spool-summary.c:806
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "No pude sincronizar la carpeta temporal %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "No pude sincronizar la carpeta de correo %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8544,65 +8772,24 @@ msgstr ""
 "No pude sincronizar la carpeta de correo %s: %s\n"
 "La carpeta puede estar corrupta, copia guardada en `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "No pude archivar %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Por favor introduzca la contraseña NNTP para %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "El servidor rechazo el nombre de usuario"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Fallo al enviar el nombre de usuario al servidor"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "El servidor rechazo el nombre de usuario ó la contraseña"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Error interno: uid en formato no válido: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:439
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:502
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "No puedo obtener mensaje %s: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:278
-#: camel/providers/pop3/camel-pop3-folder.c:437
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:510
-msgid "User cancelled"
-msgstr "Usuario cancelado"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "No pude obtener la lista de grupos del servidor."
+#: camel/providers/local/camel-spoold-store.c:117
+#, fuzzy, c-format
+msgid "Store `%s' does not exist or is not a directory"
+msgstr "`%s' no existe o no es un archivo normal."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "No pude cargar el archivo de listas de grupos para %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "No pude guardar el archivo de listas de grupos para %s: %s"
+#: camel/providers/local/camel-spoold-store.c:173
+#, fuzzy, c-format
+msgid "Mail tree %s"
+msgstr "Enviar a %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -8612,12 +8799,12 @@ msgstr "noticias USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Este es un proveedor para leer y enviar noticias a grupos de USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "Noticias USENET vía %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8661,32 +8848,47 @@ msgstr "Usuario cancelado"
 msgid "Operation failed: %s"
 msgstr "Operación cancelada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Obteniendo resumen POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:280
+#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:446
+#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:522
+msgid "User cancelled"
+msgstr "Usuario cancelado"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "No puedo obtener mensaje %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Eliminando los mensajes borrados"
 
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hay mensajes con uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:418
+#: camel/providers/pop3/camel-pop3-folder.c:427
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Obteniendo mensaje POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:448
+#: camel/providers/pop3/camel-pop3-folder.c:507
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:524
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "No puedo obtener mensaje %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitaciones indeterminadas"
@@ -8704,7 +8906,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:60
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8723,20 +8925,39 @@ 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:172
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
+msgstr ""
+"No pude conectar con el servidor POP.\n"
+"Error al enviar la contraseña: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:210
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operación no implementada"
+
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Fallo en la autenticación."
+
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
 msgstr "No pude conectar con el servidor POP en: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8744,27 +8965,28 @@ 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:229
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, fuzzy
 msgid "SASL Protocol error"
 msgstr "Error crítico"
 
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:431
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "Error de I/O"
 
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/pop3/camel-pop3-store.c:452
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPor favor escriba la contraseña POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:327
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8773,13 +8995,13 @@ msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contraseña: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, 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:82
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8790,54 +9012,50 @@ msgid ""
 msgstr ""
 "Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "No pude analizar la URL `%s'"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "No pude comunicar con sendmail: %s: correo no enviado"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "No pude hacer un fork a sendmail: %s: correo no enviado"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not send message: %s"
 msgstr "No pude enviar mensaje: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:178
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail finalizo con %s: correo no enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:185
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "No pude ejecutar %s: correo no enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:190
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail finalizo con estado %d: correo no enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr "No pude encontrar la dirección 'De' en el mensaje"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-#, fuzzy
-msgid "Could not parse recipient list"
-msgstr "No pude analizar la URL `%s'"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 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:75
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8845,125 +9063,148 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Para enviar correo conectándose a un servidor de correo usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Error de sintaxis, comando no reconocido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Error de sintaxis en los parámetros o los argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Parámetro del comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Mensaje de ayuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Servicio cerrando los canales de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio no disponible, cerrando los canales de transmisión"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Acción de correo requerida en orden, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "El usuario no es local: lo reenviaré a <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Acción solicitada del correo no realizada: el mailbox no está disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Acción solicitada no realizada: el mailbox no está disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Acción solicitada abortada: error en procesamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "El usuario no es local: por favor pruebe con <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Acción solicitada no realizada: la capacidad del sistema es insuficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Acción solicitada no realizada: excedió la capacidad de almacenamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Acción solicitada no realizada: nombre no permitido para mailbox"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Fallo en la transacción"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Es necesaria una transición de contraseña"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "El método de autenticación es demasiado débil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Cifrado requerida por el mecanismo de autenticación pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal en la autenticación"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Autenticación requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, 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:383
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, 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:336
+#, 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:350
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "Expiró el tiempo para AUTH: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "Respuesta de error a RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, 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:421
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, 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:442
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8974,94 +9215,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Envío de correo SMTP vía %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr "No puedo enviar el mensaje: dirección del remitente no definida."
-
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:662
 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:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:624
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:798
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr "Saludo del SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, 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:840
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Respuesta de error al HELO: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:884
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr "Autenticación SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:890
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticación SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:905
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Expiró el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:926
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr "Error en la petición de AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:974
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 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:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, 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:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, 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:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Expiró el tiempo para DATA: %s: correo no enviado"
@@ -9069,40 +9306,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:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 #, fuzzy
 msgid "DATA response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
-#: camel/providers/smtp/camel-smtp-transport.c:1163
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, 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:1177
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1200
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Expiró el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 #, fuzzy
 msgid "RSET response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, 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:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Respuesta de error a RSET: %s"
@@ -9132,7 +9369,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:147
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "adjunto"
 
@@ -9172,11 +9409,11 @@ msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:180
+#: composer/e-msg-composer-select-file.c:156
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr "Presione aquí para acceder a la agenda"
 
@@ -9185,47 +9422,47 @@ msgstr "Presione aquí para acceder a la agenda"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Asunto:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:188
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9233,12 +9470,12 @@ msgstr ""
 "Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje."
 
-#: composer/e-msg-composer-select-file.c:291
+#: 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:710
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9247,38 +9484,34 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:927
-msgid "Save as..."
-msgstr "Guardar como..."
-
-#: composer/e-msg-composer.c:936
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "¡Aviso!"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, ¿Sobreescribir?"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:981
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1020
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9287,7 +9520,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1034
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9296,7 +9529,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1074
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9305,7 +9538,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1145
+#: composer/e-msg-composer.c:1176
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9313,7 +9546,7 @@ msgstr ""
 "Ximian Evolution ha encontrado archivos no guardados de una sesión previa.\n"
 "¿Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1303
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9323,23 +9556,23 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1310
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1333
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1482
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Insertar Archivo"
 
-#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2462
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2479
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9347,7 +9580,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:2502 composer/e-msg-composer.c:2557
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9355,7 +9588,7 @@ msgstr ""
 "No pude crear una ventana de composición:\n"
 "No puedo activar el componente del editor HTML."
 
-#: composer/evolution-composer.c:383
+#: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -9363,7 +9596,7 @@ msgstr ""
 "No pude crear una ventana de composición, porque no ha configurado\n"
 "todavía ninguna identidad en el componente de correo."
 
-#: composer/evolution-composer.c:398
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "No puedo inicializar el componente de escritura correo de Evolution."
 
@@ -9415,12 +9648,21 @@ 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:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ya existe una archivo con ese nombre.\n"
+"¿Sobreescribirlo?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:360 mail/mail-session.c:269
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "Recuerda esta contraseña"
 
-#: e-util/e-passwords.c:362 mail/mail-session.c:270
+#: e-util/e-passwords.c:365 mail/mail-session.c:270
 msgid "Remember this password for the remainder of this session"
 msgstr "Recordar esta clave durante el resto de esta sesión"
 
@@ -9519,177 +9761,6 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Componente Evolution para el resumen de trabajo."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Componente de correo del resumen de trabajo de Evolution."
-
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "No puedo inicializar el componente de resumen de Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Elija un archivo"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Enviar un correo"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "otro enlace hacia %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "Ejecutar"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/nautilus-window.c:1267
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Cerrar"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Mueve esta carpeta a otro sitio"
-
-# src/file-manager/dfos-xfer.c:961
-#: executive-summary/component/e-summary-url.c:77
-#, fuzzy, c-format
-msgid "Move %s to the right"
-msgstr "Moviendo archivos a la Papelera"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Configurar"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Página"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"No puedo renombrar la carpeta:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Error cargando %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:61
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the RDF summary."
-msgstr "Factoría para el componente de Resumen de Correo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "Resumen"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "Factoría para el compositor de correo de Evolution."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Factoría para el componente de Resumen de Correo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-# src/nautilus-window-toolbars.c:161
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#, fuzzy
-msgid "Test service"
-msgstr "Servicios web"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Error"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Actualizar"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "_Actualizar Libre/Ocupado"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "año"
@@ -9722,11 +9793,7 @@ msgstr "hora"
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "segundo"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "segundos"
 
@@ -9801,7 +9868,7 @@ msgstr " hace"
 msgid "ago"
 msgstr "hace"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:996
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9822,7 +9889,7 @@ msgstr "Entonces"
 msgid "Add action"
 msgstr "Añadir acción"
 
-#: filter/filter-folder.c:156
+#: filter/filter-folder.c:147
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -9830,19 +9897,11 @@ msgstr ""
 "Se ha olvidado de elegir una carpeta.\n"
 "Vuelva y especifique una carpeta válida donde entregar el correo."
 
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:849
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Escribir URI de la carpeta"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<pinche aquí para seleccionar una carpeta>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9852,7 +9911,7 @@ msgstr ""
 "Error en la expresión regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 msgid "Test"
 msgstr "Prueba"
 
@@ -9881,7 +9940,8 @@ msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
 #: filter/filter-rule.c:769
-msgid "if any criteria are met"
+#, fuzzy
+msgid "if any criterion are met"
 msgstr "si se cumple algún criterio"
 
 #: filter/filter-rule.c:780
@@ -9938,212 +9998,228 @@ msgstr "con todas las carpetas locales"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Asignar puntuación"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Asignar Color"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Asignar puntuación"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belen"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contiene"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Fecha de recepción"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Fecha de envío"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Borrado"
 
-#: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr "No Existe"
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
-msgstr "Borrador"
-
-#: filter/libfilter-i18n.h:12
-msgid "Execute Shell Command"
-msgstr "Ejecutar comando de shell"
-
 #: filter/libfilter-i18n.h:13
-msgid "Exist"
-msgstr "Salir"
+msgid "does not contain"
+msgstr "no contiene"
 
 #: filter/libfilter-i18n.h:14
-msgid "Expression"
-msgstr "Expresión"
+msgid "does not end with"
+msgstr "no acaba en"
 
 #: filter/libfilter-i18n.h:15
-msgid "Follow Up"
-msgstr ""
+msgid "does not exist"
+msgstr "no existe"
 
 #: filter/libfilter-i18n.h:16
-msgid "Important"
-msgstr "Importante"
+msgid "does not sound like"
+msgstr "no suena como"
 
 #: filter/libfilter-i18n.h:17
-msgid "Mailing list"
-msgstr "Lista de correo"
+msgid "does not start with"
+msgstr "no comienza por"
 
 #: filter/libfilter-i18n.h:18
-msgid "Message Body"
-msgstr "Cuerpo del mensaje"
+msgid "Do Not Exist"
+msgstr "No Existe"
 
 #: filter/libfilter-i18n.h:19
-msgid "Message Header"
-msgstr "Cabecera del mensaje"
+msgid "Draft"
+msgstr "Borrador"
 
 #: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
-msgstr "Mover a la carpeta"
+msgid "ends with"
+msgstr "finaliza con"
 
 #: filter/libfilter-i18n.h:21
-msgid "Read"
-msgstr "Leído"
+msgid "Execute Shell Command"
+msgstr "Ejecutar comando de shell"
 
 #: filter/libfilter-i18n.h:22
-msgid "Recipients"
-msgstr "Destinatarios"
+msgid "Exist"
+msgstr "Salir"
 
 #: filter/libfilter-i18n.h:23
-msgid "Regex Match"
-msgstr "Expresión regular"
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:24
-msgid "Replied to"
-msgstr "Respondido a"
+msgid "Expression"
+msgstr "Expresión"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:8
-msgid "Score"
-msgstr "Puntuación"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1552
-msgid "Sender"
-msgstr "Remitente"
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Importante"
 
 #: filter/libfilter-i18n.h:27
-msgid "Set Status"
-msgstr "Poner estado"
+msgid "is"
+msgstr "es"
 
 #: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
-msgstr "Tamaño (Kb)"
+#, fuzzy
+msgid "is after"
+msgstr "estaba después de"
 
 #: filter/libfilter-i18n.h:29
-msgid "Source Account"
-msgstr "Fuente de la cuenta"
+#, fuzzy
+msgid "is before"
+msgstr "estaba antes de"
 
 #: filter/libfilter-i18n.h:30
-msgid "Specific header"
-msgstr "Cabecera específica"
+#, fuzzy
+msgid "is Flagged"
+msgstr "Marcado"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "es mayor que"
 
 #: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
-msgstr "Parar el proceso"
+msgid "is less than"
+msgstr "es menor que"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:932
-#: mail/message-list.etspec.h:12
-msgid "Subject"
-msgstr "Asunto"
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "no es"
 
 #: filter/libfilter-i18n.h:34
-msgid "contains"
-msgstr "contiene"
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Marcado"
 
 #: filter/libfilter-i18n.h:35
-msgid "does not contain"
-msgstr "no contiene"
+msgid "Mailing list"
+msgstr "Lista de correo"
 
 #: filter/libfilter-i18n.h:36
-msgid "does not end with"
-msgstr "no acaba en"
+msgid "Message Body"
+msgstr "Cuerpo del mensaje"
 
 #: filter/libfilter-i18n.h:37
-msgid "does not exist"
-msgstr "no existe"
+msgid "Message Header"
+msgstr "Cabecera del mensaje"
 
 #: filter/libfilter-i18n.h:38
-msgid "does not sound like"
-msgstr "no suena como"
+msgid "Move to Folder"
+msgstr "Mover a la carpeta"
 
 #: filter/libfilter-i18n.h:39
-msgid "does not start with"
-msgstr "no comienza por"
+#, fuzzy
+msgid "Play Sound"
+msgstr "Tocar un sonido:"
 
-#: filter/libfilter-i18n.h:40
-msgid "ends with"
-msgstr "finaliza con"
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "Leído"
 
 #: filter/libfilter-i18n.h:41
-msgid "exists"
-msgstr "existe"
+msgid "Recipients"
+msgstr "Destinatarios"
 
 #: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "is Flagged"
-msgstr "Marcado"
+msgid "Regex Match"
+msgstr "Expresión regular"
 
 #: filter/libfilter-i18n.h:43
-#, fuzzy
-msgid "is after"
-msgstr "estaba después de"
+msgid "Replied to"
+msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "is before"
-msgstr "estaba antes de"
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
+msgid "Score"
+msgstr "Puntuación"
 
-#: filter/libfilter-i18n.h:45
-msgid "is greater than"
-msgstr "es mayor que"
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+msgid "Sender"
+msgstr "Remitente"
 
 #: filter/libfilter-i18n.h:46
-msgid "is less than"
-msgstr "es menor que"
+msgid "Set Status"
+msgstr "Poner estado"
 
 #: filter/libfilter-i18n.h:47
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Marcado"
+msgid "Size (kB)"
+msgstr "Tamaño (Kb)"
 
 #: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr "no es"
+msgid "sounds like"
+msgstr "suena como"
 
 #: filter/libfilter-i18n.h:49
-msgid "is"
-msgstr "es"
+msgid "Source Account"
+msgstr "Fuente de la cuenta"
 
 #: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "suena como"
+msgid "Specific header"
+msgstr "Cabecera específica"
 
 #: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "comienza por"
 
+#: filter/libfilter-i18n.h:53
+msgid "Stop Processing"
+msgstr "Parar el proceso"
+
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
+msgid "Subject"
+msgstr "Asunto"
+
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Reglas"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Añadir Regla"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Editar Regla"
 
@@ -10163,30 +10239,30 @@ 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:107
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importando..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Por favor espere"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:689
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
 #: 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:782
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Guardando %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:958
-#: importers/pine-importer.c:637 mail/component-factory.c:100
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/pine-importer.c:637 mail/component-factory.c:101
 msgid "Mail"
 msgstr "Correo"
 
@@ -10214,23 +10290,74 @@ msgstr ""
 "Evolution ha encontrado archivos de GnomeCard.\n"
 "¿Quiere importarlos a Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioridad: %s"
+
+#: importers/netscape-importer.c:653
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: importers/netscape-importer.c:677
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: importers/netscape-importer.c:694
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
+#: importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está importando su vieja información de Netscape"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Papelera"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Archivo de correo local %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Analizando el directorio"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Comenzando a importar"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Configuración"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Editar filtros"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10254,45 +10381,95 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+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."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Factoría para el compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Factoría para el compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Componente Evolution para manejar el correo."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Compositor de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Componente de correo del resumen de trabajo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Componente para mostrar carpetas de correo de Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Componente para factoría de carpetas de correo de Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Factoría para el compositor de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Factoría para el componente de Resumen de Correo."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Si_n recurrencia"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Cuentas"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Interfaz de configuración del correo"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Carpeta conteniendo correo"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+msgid "This Page can be used to configure the Fonts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+msgid "This page can be used to configure E-Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19
+msgid "This page can be used to configure Mailer preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+msgid "This page can be used to configure the Composer"
+msgstr ""
 
 #: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "Carpeta para guardar correo (interno)"
+msgid "Folder containing mail"
+msgstr "Carpeta conteniendo correo"
 
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
@@ -10302,24 +10479,19 @@ msgstr "Papelera virtual"
 msgid "Virtual Trash folder"
 msgstr "Carpetas de papeleras virtuales"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "No puedo conectar con el almacén: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr "Esta carpeta no contiene mensajes."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10327,231 +10499,240 @@ msgstr ""
 "Algunas de tus opciones de correo parece que están corruptas, por favor "
 "comprueba que todo está en orden."
 
-#: mail/component-factory.c:971
+#: 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:967
 msgid "New Mail Message"
 msgstr "Nuevo mensaje de correo"
 
-#: mail/component-factory.c:971 ui/evolution-mail-global.xml.h:19
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:994
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1003
 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:1013
+#: mail/component-factory.c:1009
 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:1229
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Conectando al servidor..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-ui.c:327
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para «%s»"
 
-#: mail/folder-browser-ui.c:329
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:299 mail/mail-display.c:300 mail/mail-display.c:809
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/folder-browser.c:754
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nuevos"
 
-#: mail/folder-browser.c:757 mail/folder-browser.c:765
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr "%d ocultos"
 
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionado"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr "%d enviar"
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1062
-msgid "Create vFolder from Search"
-msgstr "Crear carpeta virtual de la búsqueda"
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Crear una Carpeta _Virtual según el mensaje"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual según el a_sunto"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual según el _remitente"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual según los _destinatarios"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual según la _Lista de Correo"
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr "Filtrar según el As_unto"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr "Filtrar según el Re_mitente"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr "Filtrar según los Des_tinatarios"
 
-#: mail/folder-browser.c:1456
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr "Filtrar según la Lista de _Correo"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/folder-browser.c:1465 ui/evolution-mail-message.xml.h:109
-msgid "_Save As..."
-msgstr "Guardar _como..."
-
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:108
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1471 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1472 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:32
+#: mail/folder-browser.c:1622
 #, fuzzy
-msgid "Follow _Up..."
+msgid "Follo_w Up..."
 msgstr "_Nombre completo..."
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1623
 #, fuzzy
-msgid "Flag Com_pleted"
+msgid "Fla_g Completed"
 msgstr "Completado"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1624
 #, fuzzy
-msgid "Clear Fla_g"
+msgid "Cl_ear Flag"
 msgstr "Limpiar"
 
 #. separator here?
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: mail/folder-browser.c:1485
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/folder-browser.c:1486
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+#, fuzzy
+msgid "_Mark as Unimportant"
 msgstr "Marcar como No Im_portante"
 
-#: mail/folder-browser.c:1490 ui/evolution-addressbook.xml.h:40
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Recuperar"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1491 ui/evolution-addressbook.xml.h:37
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1493 ui/evolution-mail-message.xml.h:111
-msgid "_Undelete"
-msgstr "_Recuperar"
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
 
-#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Añadir Remitente a la Agenda de Direcciones"
 
-#: mail/folder-browser.c:1500
-msgid "Apply Filters"
+#: mail/folder-browser.c:1653
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:1502
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:1693
-msgid "Filter on Mailing List"
-msgstr "Filtrar según la lista de correo"
-
-#: mail/folder-browser.c:1694
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "Carpeta virtual según la Lista de Correo"
 
-#: mail/folder-browser.c:1696
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1938
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar según la lista de correo (%s)"
 
-#: mail/folder-browser.c:1697
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1939
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "Carpeta virtual según la Lista de Correo (%s)"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:1865
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Predeterminado"
-
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Obteniendo información de la carpeta"
@@ -10573,44 +10754,38 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importa archivos de Outlook Express 4 a Evolution."
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "El cuerpo contiene"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Formato de almacenamiento actual:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Indexando:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Formato Mailbox"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "El cuerpo contiene"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nuevo formato de almacenamiento:"
 
-#: mail/local-config.glade.h:6
+#: mail/local-config.glade.h:4
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(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."
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
@@ -10628,86 +10803,79 @@ msgstr "Editor de Noticias de Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:974
-msgid "Could not save signature file."
-msgstr "No pude guardar el archivo de firma."
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:1051
-msgid "Save signature"
-msgstr "Guardar firma"
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#, fuzzy
+msgid "User_name:"
+msgstr "Nombre de _usuario:"
 
-#: mail/mail-account-gui.c:1057
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "R_uta:"
+
+#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
+#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Random"
+msgstr "Radio"
+
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Esta firma ha cambiado, pero no ha sido guardada.\n"
-"\n"
-"¿Quiere guardar los cambios?"
 
-#: mail/mail-account-gui.c:1681
+#: mail/mail-account-gui.c:1985
 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:149
-msgid " (default)"
-msgstr " (predeterminada)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Inhabilitar"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Habilitar"
-
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Esta seguro que quiere borrar esta cuenta?"
 
-#: mail/mail-accounts.c:296
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr "No borrar"
 
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr "¿Realmente quiere borrar realmente la cuenta?"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
-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:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Inhabilitar"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
-msgid "Mail Settings"
-msgstr "Configuración del correo"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Habilitar"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Enviar a %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr "¿Esta seguro que quiere borrar esta cuenta de noticias?"
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Asunto es %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr "Habilitada"
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Correo de %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Nombre de la cuent_a:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "lista de correo %s"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Puerto Rico"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Añadir Regla de Filtro"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10719,7 +10887,7 @@ msgstr ""
 "recibir o escribir mensajes.\n"
 "¿Querría configurarlo ahora?"
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10727,7 +10895,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10735,12 +10903,8 @@ msgstr ""
 "Necesita configurar un transporte de\n"
 "correo para poder enviarlo."
 
-#: mail/mail-callbacks.c:189
-msgid "You have not set a mail transport method"
-msgstr "No ha definido un sistema para enviar el correo"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10748,11 +10912,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:239
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "¿Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10760,7 +10924,7 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "¿Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:295
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10769,11 +10933,11 @@ msgstr ""
 "esconder la lista de direcciones, este mensaje solo contendrá destinatarios "
 "Bcc."
 
-#: mail/mail-callbacks.c:329
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr "Este mensaje solo contiene destinatarios Bcc."
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10783,15 +10947,15 @@ msgstr ""
 "cabecera Apparently-To.\n"
 "¿Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:438
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:527
+#: mail/mail-callbacks.c:497
 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:646
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10799,28 +10963,28 @@ msgstr ""
 "No pude abrir la carpeta de borradores para esta cuenta.\n"
 "¿Quiere usar la carpeta de borradores predeterminada?"
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
-#: mail/mail-callbacks.c:983
+#: mail/mail-callbacks.c:981
 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:1429 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:1431 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2091
 #, 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:2102
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10828,7 +10992,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:2141
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10836,35 +11000,39 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2169
 #, 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:2181
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:2280
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "¿Sobreescribir archivo?"
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:2282
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2366
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Mostrar el siguiente mensaje no leído"
 
-#: mail/mail-callbacks.c:2351
+#: mail/mail-callbacks.c:2373
 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:2580
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10876,7 +11044,7 @@ msgstr ""
 "\n"
 "¿Borrar realmente esos mensajes?"
 
-#: mail/mail-callbacks.c:2690
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10885,36 +11053,36 @@ msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2702
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2775
+#: mail/mail-callbacks.c:2783
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%ld de %ld"
 
-#: mail/mail-callbacks.c:2827
+#: mail/mail-callbacks.c:2836
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:2854
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2889
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresión del mensaje"
 
-#: mail/mail-callbacks.c:3055
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "¿Esta seguro que quiere abrir %d mensajes en ventanas separadas?"
 
 #: mail/mail-config-druid.c:146
 msgid ""
-"Please enter your name and email address below. The \"optional\" fields below "
-"do not need to be filled in,\n"
+"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."
 msgstr ""
 "Por favor escriba debajo su nombre y dirección de correo. Los campos  "
@@ -10927,8 +11095,8 @@ msgid ""
 "not sure, ask your system\n"
 "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
@@ -10950,8 +11118,9 @@ 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\nmake an Evolution mail account. Please enter a name for this account in "
-"the space below.\n"
+"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."
 msgstr ""
 "Casi ha acabado con el proceso de configuración del correo. La identidad, el "
@@ -10962,16 +11131,35 @@ msgstr ""
 "Este nombre solo se usará para mostrar información."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: mail/mail-config.c:356
-#, c-format
-msgid "Account %d"
-msgstr "Cuenta %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Corcho"
 
-#: mail/mail-config.c:2036
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "después de"
+
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -10982,109 +11170,158 @@ msgstr ""
 "%s\n"
 "No se crearán atajos."
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2047
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Entrada"
-
-#: mail/mail-config.c:2297
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:2375 mail/mail-config.c:2379
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
+#: mail/mail-config.c:2999
+#, fuzzy
+msgid "Unnamed"
+msgstr "Contactos sin nombre"
+
+#: mail/mail-config.c:3177
+msgid "Cannot execute signature script"
+msgstr ""
+
 #: mail/mail-config.glade.h:1
-msgid " _Check for supported types "
-msgstr "_Comprobar tipos soportados "
+#, fuzzy
+msgid " "
+msgstr ", "
 
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# libnautilus-private/nautilus-undo-signal-handlers.c:174
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr "color"
+#, fuzzy
+msgid " Edit "
+msgstr "_Editar"
 
 #: mail/mail-config.glade.h:3
 #, fuzzy
+msgid " New "
+msgstr "Nuevo"
+
+#: mail/mail-config.glade.h:4
+msgid " _Check for supported types "
+msgstr "_Comprobar tipos soportados "
+
+#: mail/mail-config.glade.h:5
+#, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL no está implementado en esta compilación de evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL no está implementado en esta compilación de evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "S_iempre cifrarme a mí mismo cuando envíe correo cifrado"
 
-#: mail/mail-config.glade.h:6
-msgid "Account"
-msgstr "Cuenta"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Cuenta %d"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Información de la cuenta"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr "Cuentas"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Cancelar operación"
+
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "Arkansas"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:13
+#, 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 "Alerts"
+msgstr "Alberta"
+
+#: mail/mail-config.glade.h:15
+#, fuzzy
+msgid "Alwa_ys sign outgoing messages when using this account"
+msgstr "Firmar _siempre el correo saliente al usar esta cuenta"
+
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Siempre cifrarm_e a mí mismo cuando envíe correo cifrado"
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "Arica"
 
-#: mail/mail-config.glade.h:13
-msgid "Always _sign outgoing messages when using this account"
-msgstr "Firmar _siempre el correo saliente al usar esta cuenta"
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Adjuntar un archivo al mensaje"
 
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "Comprobar el correo _automáticamente"
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Juego de caracteres desconocido: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Cerrar"
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Comprobando si hay correo nuevo"
 
-#: mail/mail-config.glade.h:18
-msgid "Composer"
-msgstr "Nuevo"
-
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Nuevo mensaje"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Configuración"
 
-#: mail/mail-config.glade.h:21
-msgid "Confirm when Expunging a folder"
-msgstr "Confirmar antes de comprimir una carpeta"
-
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11100,261 +11337,376 @@ msgstr ""
 "\n"
 "Pulse «Finalizar» para guardar su configuración."
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Dari"
+msgstr "Bari"
+
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Predeterminada"
 
-#: mail/mail-config.glade.h:29
-msgid "Default Forward style is: "
-msgstr "El estilo predeterminado de Reenvío es: "
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Prioridad por defecto:"
 
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Juego de caracteres predeterminado: "
 
-#: mail/mail-config.glade.h:31
-msgid "Defaults"
-msgstr "Predeterminados"
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Obteniendo mensajes"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr "ID digitales..."
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-global-preferences.c:149
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "Mostrar"
-
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "No puedo abrir el mensaje"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
-#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Borradores"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Carpeta de _borradores:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Editar..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
-msgstr "Habilitada"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Este"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "El mensaje contiene"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "Dir_ección de correo:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Vaciar pap_elera al salir"
+
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Ejecutar comando de shell"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "finaliza con"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Propiedades"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Mensaje reenviados"
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr "Obtener ID digital..."
 
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
-msgstr "Archivo de firma en HTML:"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Resaltar citas con"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Honolulú"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:46
-msgid "In HTML mail"
-msgstr "Correo en HTML"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Incluido en línea"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Guardar y cerrar"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Cargar _Imágenes"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Localización del Mailbox"
 
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
-msgstr "Hacer de esta mi cuenta pre_determinada"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Cabecera del mensaje"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Mostrar Mensaje"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Micronesia"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Notificación"
 
-#: mail/mail-config.glade.h:55
-msgid "News"
-msgstr "Noticias"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Fuentes de _noticias"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Información opcional"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_zación:"
+
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clave PGP:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Elije un color"
 
-#: mail/mail-config.glade.h:63
-msgid "Play sound file when new mail arrives"
-msgstr ""
+#: mail/mail-config.glade.h:88
+#, 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:64
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:65
-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:66
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Pr_eguntar al mandar mensajes con el asunto vacío"
-
-#: mail/mail-config.glade.h:67
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Preguntar al mandar mensajes que tan solo tengan definido el _Bcc"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Imprimir los contactos seleccionados"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Quote original message"
+msgstr "No puedo abrir el mensaje"
+
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Re_cuerda esta contraseña"
 
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Responder a:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
-msgstr "Recibiendo Mensajes"
-
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Opciones de recepción"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Recuerda esta contraseña"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Información requerida"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Seguridad"
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "Same as text"
+msgstr "Somerset"
+
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro"
 
-#: mail/mail-config.glade.h:77
-msgid "Security"
-msgstr "Seguridad"
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:78
-msgid "Select Filter Log file..."
-msgstr "Seleccione un archivo de actividad para los filtros..."
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr "Enviando correo"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Archivo de firma:"
 
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
-msgstr "Enviando Correo"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Borrar todas menos la firma"
 
-#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Enviado"
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
+msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:115
 msgid "Sent _messages folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:116
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:117
 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:87
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr "_Tipo de servidor:"
 
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
-msgstr "Archivo de firma:"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Atajos"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Guardar firma"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr "Fuente"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr "Información de la Fuente"
 
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-msgstr "Fuentes"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Specify filename:"
+msgid "Specify _filename:"
 msgstr "Nombre del estilo:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr "Mailbox estándar de Unix"
 
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
-msgstr "U_se conexiones seguras (SSL)"
+#: mail/mail-config.glade.h:128
+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:97
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Use _HTML for this signature"
+msgstr "Firma en _HTML:"
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Variable"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11364,130 +11716,216 @@ msgstr ""
 "\n"
 "Pulse «Siguiente» para comenzar. "
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "XEmacs"
+msgstr "Este"
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "C_argar imágenes fuera de la red"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:141
 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:103
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "Tipo de _autenticación: "
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tipo de _autenticación: "
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "Comprobar el correo _automáticamente"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID del _certificado:"
 
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
-msgstr "Carpeta de _borradores:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
+msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
-msgstr "Vaciar pap_elera al salir"
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Confirmar antes de comprimir una carpeta"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Predeterminados"
+
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
+msgstr "Nombre de archivo:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "_Reenviar Mensaje"
+
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "Correo en HTML"
+
+#: mail/mail-config.glade.h:160
 #, fuzzy
-msgid "_HTML signature:"
+msgid "_HTML Signature:"
 msgstr "Firma en _HTML:"
 
-#: mail/mail-config.glade.h:114
-msgid "_Highlight citations with"
-msgstr "_Resaltar citas con"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Identity"
+msgstr "Identidad"
 
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "_Servidor:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Idioma"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:164
 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:117
-msgid "_Log filter actions to:"
-msgstr "Registrar acciones de _los filtros en:"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Hacer de esta mi cuenta pre_determinada"
 
-#: mail/mail-config.glade.h:118
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como Leído tras"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr "_No cargar nunca imágenes desde la red"
 
-#: mail/mail-config.glade.h:121
-msgid "_Organization:"
-msgstr "_Organización:"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr "Localización del binario de _PGP:"
 
-#: mail/mail-config.glade.h:123
-msgid "_Path:"
-msgstr "R_uta:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:124
-msgid "_Remember this password"
-msgstr "_Recuerda esta contraseña"
+#: mail/mail-config.glade.h:172
+#, 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:125
-msgid "_Send mail in HTML format by default."
-msgstr "Enviar el men_saje en formato HTML de forma predeterminada"
+#: mail/mail-config.glade.h:173
+#, 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:126
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Random"
+msgstr "Radio"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Recibiendo Mensajes"
+
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Re: Todos"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 #, fuzzy
-msgid "_Server type: "
-msgstr "Tipo de _servidor: "
+msgid "_Script:"
+msgstr "_Seguridad"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Seguridad"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Enviando Correo"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Mostrar tiempo como"
 
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
 msgstr "_Archivo de firma:"
 
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-msgstr "Nombre de _usuario:"
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Text Signature:"
+msgstr "Firma en _HTML:"
+
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "U_se conexiones seguras (SSL)"
+
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Variable"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_cada"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr "color"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr "descripción"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr "placeholder"
-
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-msgstr "segundos."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "No pude crear un contexto de firma PGP."
@@ -11524,154 +11962,137 @@ 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:245
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:310
+#: mail/mail-display.c:344
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Guardar en disco..."
 
-#: mail/mail-display.c:358
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (vía %s)"
 
-#: mail/mail-display.c:425
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:446
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:1224
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1717
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr "Abrir enlace en el Navegador"
 
-#: mail/mail-display.c:1719
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr "Copiar Dirección del enlace"
 
-#: mail/mail-display.c:1722
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr "Guardar enlace como (ARRÉGLAME)"
 
-#: mail/mail-display.c:1725
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Dirección errónea"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:6
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:13
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1784
-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:1807
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution no reconoce este tipo de mensajes firmados."
-
-#: mail/mail-format.c:1815
-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:1823
-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:915
+#, fuzzy
+msgid "Mailer"
+msgstr "Correo"
 
-#: mail/mail-format.c:2066
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2080
+#: mail/mail-format.c:2120
 #, 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:2085
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:2114
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
-#: mail/mail-format.c:2127
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando carpeta"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11680,27 +12101,27 @@ msgstr ""
 "No puedo guardar la meta información de la carpeta: probablemente\n"
 "no puedas volver a abrir esta carpeta: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No puedo guardar la meta información de la carpeta en %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "No puedo borrar la meta información de la carpeta %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta «%s» al formato «%s»"
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s no puede ser reconfigurado porque no es una carpeta local"
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11708,11 +12129,11 @@ msgstr ""
 "Si no puede volver a abrir este buzón, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr "No puede cambiar el formato de una carpeta no local."
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
@@ -11739,121 +12160,116 @@ msgstr ""
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Filtrando carpeta"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:534 mail/mail-ops.c:563
+#: mail/mail-ops.c:538 mail/mail-ops.c:567
 msgid "However, the message was successfully sent."
 msgstr "Aun así, este mensaje fue enviado correctamente."
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando «%s»"
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:740 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:702 src/file-manager/dfos-xfer.c:963
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Moviendo"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:725
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Papelera"
-
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta '%s'"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1569
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11862,7 +12278,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11871,11 +12287,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11884,27 +12300,27 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Ejecutando el comando de shell: %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -11942,42 +12358,42 @@ msgstr "Buscar:"
 msgid "Matches:"
 msgstr "Coincide:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Camino: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Cancelar todo"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
+#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Cancelado"
 
@@ -11994,26 +12410,40 @@ msgstr "Introduzca su contraseña para %s"
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: mail/mail-summary.c:109
-#, fuzzy
-msgid "Incomplete message written on pipe!"
-msgstr "Mensaje cifrado no mostrado"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "No pude guardar el archivo de firma."
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
+msgstr "Guardar firma"
 
-#: mail/mail-summary.c:467
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta firma ha cambiado, pero no ha sido guardada.\n"
+"\n"
+"¿Quiere guardar los cambios?"
+
+#: mail/mail-signature-editor.c:357
 #, fuzzy
-msgid "Mail Summary"
-msgstr "Resumen de correo"
+msgid "Signature name:"
+msgstr "Archivo de firma:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Mensaje reenviado"
 
@@ -12040,10 +12470,6 @@ msgstr ""
 "    '%s'\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr "Carpetas virtuales"
-
 #: mail/mail-vfolder.c:785
 msgid "vFolders"
 msgstr "Carpetas virtuales"
@@ -12061,96 +12487,96 @@ msgstr "Tratando de editar una carpeta virtual `%s' que no existe."
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Sin asunto)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensaje"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: mail/message-list.c:645
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:655
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:967
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:976
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:988
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2365
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
 msgstr "Falta "
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1199
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Flag Status"
 msgstr "Estado"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Marcado"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr ""
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "Recibido"
 
@@ -12162,6 +12588,56 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Avanzar"
+
+#: mail/message-tag-followup.c:59
+#, fuzzy
+msgid "Follow-Up"
+msgstr "_Nombre completo..."
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Información de la Fuente"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward"
+msgstr ""
+"#-#-#-#-#  evolution-es.po (evolution 1.0)  #-#-#-#-#\n"
+"Reenviar#-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#\n"
+"Adelante"
+
+#: mail/message-tag-followup.c:62
+msgid "No Response Necessary"
+msgstr ""
+
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "Responder"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Re: Todos"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Previsualización"
+
+#: mail/message-tag-followup.c:315
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "_Nombre completo..."
+
 #: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -12183,7 +12659,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "De-suscribiendo la carpeta «%s»"
 
 #: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -12227,6 +12703,35 @@ msgstr "_Suscribir"
 msgid "_Unsubscribe"
 msgstr "De-s_uscribir"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "La carpeta contiene el Resumen de Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Compositor de correo de Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Factoría para el control de tareas de Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Componente de correo del resumen de trabajo de Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Configuración del resumen"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+msgid "This page can be used to customize the appearance of the Summary page."
+msgstr ""
+
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr "Aarhus"
@@ -22031,14 +22536,10 @@ msgstr ""
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "La carpeta contiene el Resumen de Evolution"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "No puedo inicializar el componente de resumen de Evolution."
-
 #: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Citas"
@@ -22059,44 +22560,50 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Sin descripción"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr "Resumen de correo"
 
+#. Make this static, saves having to recompute it each time
+#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
+msgid "VFolders"
+msgstr "Carpetas virtuales"
+
+#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
+msgid "Local Folders"
+msgstr "Carpetas locales"
+
 #. translators: Put a list of codes for locations you want to see in
 #. My Evolution by default here. You can find the list of all
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:82
+#: my-evolution/e-summary-preferences.c:92
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "LEMD:LEVS:LEVC"
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Palabra del Día"
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr "Frase del Día"
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr "Añadir una fuente de noticias"
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Escriba la URL de la fuente de noticias que quiere añadir"
 
-#: my-evolution/e-summary-preferences.c:747
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Nombre:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr "Configuración del resumen"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Error obteniendo RDF"
@@ -22105,6 +22612,30 @@ msgstr "Error obteniendo RDF"
 msgid "News Feed"
 msgstr "Fuentes de noticias"
 
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "_Añadir"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "Eliminar"
+
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Shannon"
+
 #: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "No hay tareas"
@@ -22126,19 +22657,19 @@ msgstr "Lo siento, pero hubo un error al leer %s."
 msgid "Weather"
 msgstr "Tiempo"
 
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Por favor espere..."
 
-#: my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Imprimir resumen"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Ha fallado la impresión del resumen"
 
@@ -22146,38 +22677,6 @@ msgstr "Ha fallado la impresión del resumen"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "El componente de resumen de trabajo no pudo inicializar Bonobo.\n"
 
-#: my-evolution/metar.c:29
-msgid " F"
-msgstr " F"
-
-#: my-evolution/metar.c:29
-msgid " C"
-msgstr " C"
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "nudos"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "kph"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "inHg"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "mmHg"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "millas"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilómetros"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Cielo claro"
@@ -23408,63 +23907,54 @@ msgstr "_Horario"
 msgid "_Weather"
 msgstr "_Tiempo"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-#, fuzzy
-msgid "Factory for the Evolution notes component."
-msgstr "Factoría para el compositor de correo de Evolution."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
+msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Factory for the Notes control"
-msgstr "Factoría para el control de tareas de Evolution."
+msgid "Default Folders"
+msgstr "Seleccionar carpeta"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "La shell de Evolution."
 
-#: shell/e-activity-handler.c:160
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Mostrar detalles"
 
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Cancelar operación"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Entrada"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Salida"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Carpetas locales"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instalación de Evolution"
 
-#: shell/e-setup.c:128
+#: shell/e-setup.c:130
 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\nen su carpeta personal de Evolution"
+"Esta nueva versión de Evolution necesita instalar archivos adicionales\n"
+"en su carpeta personal de Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Por favor, pulse en «Aceptar» para instalar los archivos, o «Cancelar» para "
 "salir."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "No pude actualizar correctamente los archivos"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23475,7 +23965,7 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -23484,7 +23974,7 @@ msgstr ""
 "Ha ocurrido un error mientras se copiaban archivos a\n"
 "`%s'."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23495,7 +23985,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23506,7 +23996,7 @@ msgstr ""
 "no tiene los permisos adecuados. Por favor\n"
 "hágalo legible y ejecutable, y reinicie Evolution."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23517,7 +24007,7 @@ msgstr ""
 "debe ser eliminador para que Evolution funcione correctamente.\n"
 "Por favor elimine ese archivo y reinicie Evolution."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23528,7 +24018,7 @@ msgstr ""
 "Por favor, renombre lo para permitir la instalación\n"
 "de los archivos de usuario de Evolution."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23542,7 +24032,7 @@ msgstr ""
 "Evolution.\n"
 "¿Quiere que borre ese directorio?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23553,50 +24043,53 @@ msgstr ""
 "de Evolution. Por favor, renombre lo para permitir la\n"
 "instalación de los archivos de usuario de Evolution."
 
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr "Evolution "
-
-#: shell/e-shell-about-box.c:41
-#, fuzzy
-msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Producido por"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "No pude comprobar la carpeta: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"No puedo renombrar la carpeta:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "No puedo mover una carpeta sobre si misma."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "No puedo copiar una carpeta sobre si misma."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:206
 msgid "Cannot move a folder into one of its descendants."
 msgstr "No puedo mover una carpeta a uno de sus descendientes."
 
-#: shell/e-shell-folder-commands.c:307
+#: shell/e-shell-folder-commands.c:321
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Especificar una carpeta en la que copiar la carpeta «%s»:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Copiar una carpeta"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Especificar una carpeta a la que mover la carpeta «%s»:"
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Mover una carpeta"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23605,18 +24098,18 @@ msgstr ""
 "No pude borrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Borrar «%s»"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "¿Esta seguro que quiere borrar la carpeta «%s»?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23625,16 +24118,16 @@ msgstr ""
 "No puedo renombrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar carpeta «%s» a:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23649,7 +24142,7 @@ msgstr ""
 "No puedo crear la carpeta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:304
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear nuevas carpetas"
 
@@ -23681,8 +24174,8 @@ 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."
 
@@ -23732,8 +24225,8 @@ 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:445
 msgid "Importing"
@@ -23837,8 +24330,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:503
-#: shell/e-shell-user-creatable-items-handler.c:548
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nuevo"
@@ -23860,92 +24353,95 @@ msgstr "El nombre de la carpeta no puede contener barras (/)."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' y '..' son nombres reservados de carpetas."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 msgid "About Ximian Evolution"
 msgstr "Acerca de Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:427
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:428
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:548
+#: shell/e-shell-view-menu.c:565
 msgid "Create a new shortcut"
 msgstr "Crear un nuevo atajo"
 
-#: shell/e-shell-view-menu.c:549
+#: shell/e-shell-view-menu.c:566
 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:580
-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."
-
-#: shell/e-shell-view-menu.c:588
-#, c-format
-msgid "Error executing %s."
-msgstr "Error ejecutando %s."
-
-#: shell/e-shell-view-menu.c:691
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:704 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
-#: shell/e-shell-view-menu.c:717 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-view.c:220
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrándose)"
 
-#: shell/e-shell-view.c:1703
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1705
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(nada)"
 
-#: shell/e-shell-view.c:1752
+#: shell/e-shell-view.c:1867
 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:1759
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution está en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1765
+#: shell/e-shell-view.c:1880
 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:651
+#: shell/e-shell.c:169
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"El error del sistema de activación es:\n"
+"%s"
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23956,19 +24452,23 @@ 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:1933
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Aceptar"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:1935
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr "No puedo registrarme en OAF"
 
-#: shell/e-shell.c:1937
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: shell/e-shell.c:1939 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Error genérico"
 
@@ -24087,76 +24587,72 @@ msgstr "Bo_rrar"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"No puedo transferir la carpeta:\n"
-"%s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Entrada"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Sin nombre)"
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Chico"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Sin errores"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Es tipo de archivo especificado no es válido"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "Error de I/O"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "No hay suficiente espacio para crear la carpeta"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Esta carpeta no está vacía"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "No se encontró la carpeta especificada"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Función sin implementar en este manejador"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Operación no implementada"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no está implementado por este manejador"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "La carpeta especificada no puede ser modificado o borrado"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 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:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "No puedo crear una carpeta con ese nombre"
 
@@ -24166,10 +24662,13 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr "<pinche aquí para seleccionar una carpeta>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24207,67 +24706,67 @@ msgstr ""
 "El error del sistema de activación es:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "Error CORBA"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Interrumpido"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr "Argumento inválido"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr "Ya tiene un dueño"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Sin dueño"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr "No encontrado"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr "Tipo no soportado"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr "Schema no soportado"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr "Operación no soportada"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Error interno"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr "Salir"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr "URI no válida"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Tiene subcarpetas"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr "No queda sitio"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr "El antiguo dueño a muerto"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test type"
 msgstr "tipo de soporte"
@@ -24396,49 +24895,49 @@ 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:88
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:94
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr "Evolution está terminando ..."
 
-#: shell/main.c:223
+#: shell/main.c:227
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No puedo acceder a la shell de Ximian Evolution."
 
-#: shell/main.c:232
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No puedo inicializar la shell de Ximian Evolution: %s"
 
-#: shell/main.c:302
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr "Deshabilitar pantalla de entrada"
 
-#: shell/main.c:303
+#: shell/main.c:318
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comenzando a importar"
 
-#: shell/main.c:304
+#: shell/main.c:319
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/main.c:305
+#: shell/main.c:320
 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:323
+#: shell/main.c:338
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:353
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
@@ -24466,7 +24965,7 @@ msgstr "No ha especificado un nombre de archivo."
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Copiar mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Copiar la selección"
 
@@ -24483,7 +24982,7 @@ msgstr "Crear nuevo contacto"
 msgid "Create new contact list"
 msgstr "Crear nueva lista de contactos"
 
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:12
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Cortar la selección"
 
@@ -24491,56 +24990,52 @@ msgstr "Cortar la selección"
 msgid "Delete selected contacts"
 msgstr "Borrar los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Dump"
-msgstr "Volcar"
-
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:13
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Mover mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:14
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Pegar el contenido del porta papeles"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Vista previa de los contactos a imprimir"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Imprimir los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:22
 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:24
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Seleccionar todos los contactos"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Enviar un mensaje a los contactos seleccionados"
 
 #
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Enviar los contactos seleccionados a otra persona."
 
@@ -24548,195 +25043,132 @@ 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:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Parar la carga"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 #, fuzzy
 msgid "View the current contact"
 msgstr "la fecha actual"
 
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:31 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:9
-#: ui/evolution-mail-global.xml.h:17 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:92 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:15
+#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:35
 msgid "_Actions"
 msgstr "A_cciones"
 
 #: ui/evolution-addressbook.xml.h:33
-msgid "_Addressbook Sources..."
-msgstr "Fuentes de la _Agenda..."
-
-#: ui/evolution-addressbook.xml.h:35
 msgid "_Contact List"
 msgstr "Lista de _contactos"
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Reenviar contactos..."
 
-#: ui/evolution-addressbook.xml.h:43 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:106
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "Im_primir..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "_Mover a la carpeta..."
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "G_uardar como vCard"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "Bu_scar contactos"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Seleccionar todo"
 
 #
-#: ui/evolution-addressbook.xml.h:47
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Enviar un _mensaje al contacto..."
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Configurar las opciones del calendario"
-
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Crear un nuevo _evento de todo el día"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Crear una nueva _tarea"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Crear una _nueva cita"
-
-#: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Create a _New Meeting"
-msgstr "Crear una _nueva cita"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr "Crear una nueva cita"
-
-#: ui/evolution-calendar.xml.h:9
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "Crear una nueva tarea"
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Crear una nueva tarea"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr "Crear un evento para todo el día"
-
-#: ui/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "Día"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Borrar la cita"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Ir a"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Volver"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Avanzar"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Ir a una _fecha"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Ir a una fecha específica"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Ir a hoy"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Vista previa del calendario a imprimir"
 
-#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+#: 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:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publicar información de disponibilidad para este calendario"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Mostrar un día"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Mostrar una semana"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Mostrar un semana laboral"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "Cit_a..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Configuración del calendario..."
-
-#: ui/evolution-calendar.xml.h:40
-#, fuzzy
-msgid "_Meeting..."
-msgstr "Reunión"
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicar la información de disponibilidad"
-
-#: ui/evolution-calendar.xml.h:44
-msgid "_Task..."
-msgstr "_Tarea..."
-
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/nautilus-window.c:1267
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
@@ -24768,18 +25200,18 @@ msgstr "Ver el elemento que va a ser impreso"
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Imprimir..."
-
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Guardar"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Guardar como..."
+
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Guardar y cerrar"
 
@@ -24797,8 +25229,8 @@ msgstr "Guardar este elemento a disco"
 #: 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:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:40
 msgid "_File"
 msgstr "_Archivo"
 
@@ -24824,7 +25256,7 @@ 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:11
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -24885,6 +25317,12 @@ msgstr "Concertar un encuentro para este elemento"
 msgid "Customise My Evolution"
 msgstr "Personalizar Mi Evolution"
 
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# libnautilus-private/nautilus-program-chooser.c:1262
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Cancelar"
+
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancelar la operación de correo actual"
@@ -24894,75 +25332,55 @@ msgid "Compose _New Message"
 msgstr "Componer un _nuevo mensaje"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Crear o editar cuentas de correo y otras preferencias"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear o editar reglas para el filtrado de mensajes"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Crear o editar definiciones de carpetas virtuales"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Vaciar _Papelera"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Olvidar _contraseña"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Olvidar las contraseñas recordadas con lo que será preguntado de nuevo"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Abrir una ventana para escribir un mensaje de correo"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todos los mensajes borrados de todas las carpetas"
 
-#: ui/evolution-mail-global.xml.h:12
-msgid "Send / Receive"
-msgstr "Enviar / Recibir"
-
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar el correo en la cola y obtener el nuevo"
-
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Mostrar ventana de vista previa del mensajes"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:12
 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:16
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Settings..."
-msgstr "_Configuración del correo..."
-
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "Vista _previa"
 
-#: ui/evolution-mail-global.xml.h:22
-msgid "_Send / Receive"
-msgstr "_Enviar / Recibir"
-
-#: ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_Suscribirse a las carpetas..."
 
@@ -25059,11 +25477,11 @@ msgstr "Oculta temporalmente los mensajes seleccionados"
 msgid "Threaded Message list"
 msgstr "Lista de Mensajes Encadenados"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:19
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Carpeta"
 
@@ -25079,217 +25497,235 @@ msgstr "_Propiedades..."
 msgid "_Threaded Message List"
 msgstr "_Lista de Mensajes Encadenados"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "Add Sender to Address _Book"
+msgid "A_dd Sender to Addressbook"
 msgstr "Añadir Remitente a la Agenda de Direcciones"
 
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Aplicar filtro"
+
 #: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Añadir Remitente a la Agenda de Direcciones"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar filtros a los mensajes seleccionados"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Responder a todos los destinatarios del mensaje seleccionado"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responder a la lista de correo remitente del mensaje seleccionado"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responder al remitente del mensaje seleccionado"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Copiar mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Crear una Carpeta _Virtual según el mensaje"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear una regla para filtrar los mensajes de este remitente"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crear una regla para filtrar los mensajes de estos destinatarios"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crear una regla para filtrar los mensajes de esta lista de correo"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crear una regla para filtrar los mensajes con este asunto"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Crear una carpeta virtual para estos destinatarios"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Crear una carpeta virtual para esta lista de correo"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Crear una carpeta virtual para este remitente"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Crear una carpeta virtual para este asunto"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Reducir el tamaño del texto"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Mostrar el siguiente mensaje importante"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Mostrar el mensaje siguiente"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Mostrar el siguiente mensaje no leído"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Mostrar el siguiente hilo no leído"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Mostrar el anterior mensaje importante"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Mostrar el mensaje anterior"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no leído"
 
-#: ui/evolution-mail-message.xml.h:27
+#: 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"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar según la _lista de correo..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtrar según el remite_nte..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtrar según los destinata_rios..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtrar según el a_sunto..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Marcar los mensajes seleccionados para borrar"
 
-#: ui/evolution-mail-message.xml.h:33
-msgid "Force images in HTML mail to be loaded"
-msgstr "Forzar que las imágenes en los correos en HTML sean cargadas"
-
 #: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Forward"
-msgstr ""
-"#-#-#-#-#  evolution-es.po (evolution 1.0)  #-#-#-#-#\n"
-"Reenviar#-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#\n"
-"Adelante"
+msgid "Follow _Up..."
+msgstr "_Nombre completo..."
 
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "Forzar que las imágenes en los correos en HTML sean cargadas"
+
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reenviar el mensaje seleccionado en el cuerpo de un nuevo mensaje"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenviar el mensaje seleccionado citado como una respuesta"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Reenviar el mensaje seleccionado a alguien"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reenviar el mensaje seleccionado como un adjunto a alguien"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Incrementar el tamaño del texto"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Cargar _Imágenes"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Marcar como I_mportante"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Marcar como _no leído"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Marcar como No Imp_ortante"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Marcar los mensajes seleccionados como leídos"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Marcar los mensajes seleccionados como importantes"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leídos"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Marcar los mensajes seleccionados como no importantes"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para borrar"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Mover mensajes seleccionados a otra carpeta"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/music/nautilus-music-view.c:1170
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Siguiente"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Siguiente mensaje importante"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Siguiente mensaje"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Siguiente mensaje importante"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Siguiente hilo"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Siguiente mensaje no leído"
 
 #: ui/evolution-mail-message.xml.h:58
@@ -25305,155 +25741,151 @@ msgid "Original Si_ze"
 msgstr "Ta_maño original"
 
 #: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Mensaje anterior no leído"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Mensaje importante previo"
+
+#: ui/evolution-mail-message.xml.h:63
 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:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Mensaje importante previo"
-
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Mensaje previo"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Mensaje anterior no leído"
-
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Imprimir este mensaje"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Re_direct"
 msgstr "Directorio de inicio"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Reenviar el mensaje seleccionado a alguien"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply"
-msgstr "Responder"
-
-#: ui/evolution-mail-message.xml.h:72
-msgid "Reply to All"
-msgstr "Re: Todos"
-
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Dejar el texto en su tamaño original"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "Bu_scar mensaje..."
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "_Más pequeño"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Guardar el mensaje en un archivo de texto"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:78
 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:80
+#: ui/evolution-mail-message.xml.h:79
 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:81
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "Mostrar la fuente del men_saje"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Mostrar cabeceras completas"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Mostrar mensajes en el estilo normal"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Mostrar mensajes con todas las cabeceras"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "Mostrar la fuentes sin formatear del mensaje"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "Ta_maño del texto"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Recuperar los mensajes seleccionados"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "Carpeta virtual según la _Lista de Correo..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "Carpeta virtual según el Remite_nte..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "Carpeta virtual según los Destinata_rios..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "Carpeta virtual según el A_sunto..."
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Apply Filters"
-msgstr "_Aplicar filtro"
-
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Attached"
 msgstr "Adjuntar"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "_Copiar a la Carpeta"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Ir a"
+
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Inline"
 msgstr "Incluido en línea"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Mayor"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Mover a la Carpeta"
 
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Siguiente mensaje"
+
 #: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "Vista _Normal"
@@ -25462,31 +25894,39 @@ msgstr "Vista _Normal"
 msgid "_Open Message"
 msgstr "_Abrir Mensaje"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Mensaje previo"
+
+#: ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:110 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Herramientas"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Recuperar"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 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:6 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:33
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:36
 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:50
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
 msgid "_View"
 msgstr "_Vista"
 
@@ -25510,11 +25950,11 @@ msgstr "Cifrar este mensaje con PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Cifra este mensaje con su certificado de cifrado S/MIME"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "For_mato"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
@@ -25530,6 +25970,12 @@ msgstr "Insertar un archivo como texto en el mensaje"
 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
+msgid "Open"
+msgstr "Abrir"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir un archivo"
@@ -25563,7 +26009,7 @@ msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
@@ -25588,6 +26034,7 @@ msgid "Send _later"
 msgstr "Enviar _mas tarde"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
@@ -25656,7 +26103,7 @@ msgid "_From Field"
 msgstr "Campo _De"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -25668,13 +26115,9 @@ msgstr "_Abrir..."
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Seguridad"
-
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/nautilus-window-menus.c:1325
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "A_yuda"
 
@@ -25730,39 +26173,41 @@ msgstr "Obtener la última información de la tarea"
 msgid "Re_fresh Task"
 msgstr "Re_leer Tarea"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Configurar la vista de las tareas"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Copiar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Cortar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "Borrar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Borrar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "_Marcar como completo"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Pegar la tarea del portapapeles"
 
-#: ui/evolution-tasks.xml.h:14
-msgid "Tasks Settings..."
-msgstr "Configuración de las tareas..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Vista previa de los contactos a imprimir"
+
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Imprimir este mensaje"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25831,116 +26276,121 @@ msgid "Open this folder in an other window"
 msgstr "Abre esta carpeta en una nueva ventana"
 
 #: ui/evolution.xml.h:21
+msgid "Send / Receive"
+msgstr "Enviar / Recibir"
+
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Enviar el correo en la cola y obtener el nuevo"
+
+#: ui/evolution.xml.h:23
 msgid "Show information about Ximian Evolution"
 msgstr "Mostrar información acerca de Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Enviar reporte de fallo"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un reporte de fallo usando Bug Buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Toggle"
 msgstr "Activar"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Activar si se estamos trabajando desconectados o no."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Ximian Evolution"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr "Barra de _carpetas"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 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:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "_Nueva carpeta"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 msgid "_Pilot Settings..."
 msgstr "_Configuración del pilot..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
+msgstr "_Enviar / Recibir"
+
+#: ui/evolution.xml.h:53
 msgid "_Shortcut"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:54
 msgid "_Shortcut Bar"
 msgstr "Barra de atajo_s"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Cambiar las propiedades del resumen"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Imprimir resumen"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Recargar"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Regenerar la vista"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "_Configuración del resumen..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Tarjetas de Visita"
@@ -26122,20 +26572,20 @@ msgstr "Ucraniano"
 msgid "Visual"
 msgstr "Visalia"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Juego de caracteres desconocido: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Introduzca el Juego de caracteres a usar"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Otro..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Codificación de Caracteres"
 
@@ -26143,30 +26593,32 @@ msgstr "Codificación de Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Editor de búsquedas"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Guardar búsqueda"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Añadir a las búsquedas guardadas"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Limpiar"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Guardar búsqueda"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Mostrar todo"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Añadir a las búsquedas guardadas"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Información"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Error"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Pregunta"
@@ -26180,11 +26632,21 @@ msgstr "Mensaje"
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: widgets/misc/e-search-bar.c:342
-msgid "Sear_ch"
-msgstr "Bus_car"
+#: widgets/misc/e-search-bar.c:477
+#, fuzzy
+msgid "_Find Now"
+msgstr "Buscar ahora"
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Limpiar"
 
-#: widgets/misc/e-search-bar.c:468
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Limpiar"
+
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr "Buscar ahora"
 
@@ -26210,3 +26672,778 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Conectando al servidor LDAP..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Esperando la conexión al servidor LDAP..."
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Editar agenda de direcciones"
+
+#, fuzzy
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "Autenticación requerida"
+
+#~ msgid "Account Name"
+#~ msgstr "Nombre de la cuenta"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Añadir agenda de direcciones"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzado"
+
+#~ msgid "Base"
+#~ msgstr "Base"
+
+#, fuzzy
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "_Mi servidor requiere autenticación"
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
+#~ "server"
+#~ msgstr ""
+#~ "Evolution usará esta dirección de correo para autenticarte contra el servidor"
+
+#~ msgid "Server Name"
+#~ msgstr "Nombre del servidor"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Se requiere la información de debajo para añadir una agenda.  "
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "Esta información no es requerida por la mayoría de los servidores LDAP."
+
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are used "
+#~ "in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Esta información la usa su servidor LDAP para especificar que nodos son "
+#~ "usados en una búsqueda. Para más información contacte con el administrador "
+#~ "del servidor."
+
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact your "
+#~ "server administrator for more information."
+#~ msgstr ""
+#~ "Este es el nodo base de todas sus búsquedas en el servidor LDAP. Para más "
+#~ "información contacte con el administrador del servidor."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Este es el nombre del servidor donde está su agenda."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Este es el puerto que usa su servidor LDAP."
+
+#~ msgid "Other Contacts"
+#~ msgstr "Otros contactos"
+
+#~ msgid "Name contains"
+#~ msgstr "El nombre contiene"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# components/sample/nautilus-sample-content-view.c:85
+#~ msgid "(none)"
+#~ msgstr "(ninguno)"
+
+#~ msgid "C_ontaining:"
+#~ msgstr "C_onteniendo:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Mostrar contactos que concuerden con el siguiente criterio:"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "¿Esta seguro que quiere\n"
+#~ "borrar este contacto?"
+
+#~ msgid "Starting:"
+#~ msgstr "Comenzando:"
+
+#~ msgid "Ending:"
+#~ msgstr "Finalizando:"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Crear una nueva cita con un _recordatorio por defecto"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Primer día de la se_mana:"
+
+#~ msgid "_Other"
+#~ msgstr "_Otro"
+
+#~ msgid "Click here to add an attendee"
+#~ msgstr "Pulse aquí para añadir un contacto"
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Delete this Task"
+#~ msgstr "_Borrar esta tarea"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "La reunión empieza: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "La tarea empieza: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "La información de disponibilidad comienza: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Empieza: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "La reunión termina: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "La información de disponibilidad finaliza: <b>"
+
+#~ msgid "Ends: <b>"
+#~ msgstr "Termina: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Tarea completada: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Plazo para la tarea: <b>"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "Información del calendario"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "Error de calendario"
+
+#~ msgid "An unknown person"
+#~ msgstr "Una persona desconocida"
+
+#~ msgid ""
+#~ "<br> Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr ""
+#~ "<br> Por favor revise la siguiente información, y seleccione una acción del "
+#~ "menú de abajo."
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ninguna<i>"
+
+#, fuzzy
+#~ msgid "Status:"
+#~ msgstr "E_stado:"
+
+#, fuzzy
+#~ msgid "Tentatively Accepted"
+#~ msgstr "Aceptar tentativamente"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Elija una acción:"
+
+#~ msgid "Update"
+#~ msgstr "Actualizar"
+
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Aceptar tentativamente"
+
+#~ msgid "Decline"
+#~ msgstr "Rechazar"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Enviar información de disponibilidad"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Actualizar el estado del remitente"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Enviar última información"
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> ha publicado información de reuniones."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Información  de reuniones"
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> solicita su presencia en una reunión."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Propuesta de reunión"
+
+#~ msgid "<b>%s</b> wishes to add to an existing meeting."
+#~ msgstr "<b>%s</b> desea apuntarse a una reunión existente."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Actualización de la reunión"
+
+#~ 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."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Petición de actualización de la reunión"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> ha contestado a la petición de reunión."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Respuesta de reunión"
+
+#~ msgid "<b>%s</b> has cancelled a meeting."
+#~ msgstr "<b>%s</b> ha cancelado una reunión."
+
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Cancelación de reunión"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Mensaje de reunión erróneo"
+
+#~ msgid "<b>%s</b> has published task information."
+#~ msgstr "<b>%s</b> ha publicado la información de la tarea."
+
+#~ msgid "Task Information"
+#~ msgstr "Información de la tarea"
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> te pide que realices una tarea."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Propuesta de tarea"
+
+#~ msgid "<b>%s</b> wishes to add to an existing task."
+#~ msgstr "<b>%s</b> desea añadir a una tarea existente."
+
+#~ msgid "Task Update"
+#~ msgstr "Actualización de tarea"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> quiere recibir la última información de la tarea."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Petición de actualización de tarea"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> ha contestado a una asignación de tarea."
+
+#~ msgid "Task Reply"
+#~ msgstr "Respuesta a una tarea"
+
+#~ msgid "<b>%s</b> has cancelled a task."
+#~ msgstr "<b>%s</b> ha cancelado una tarea."
+
+#~ msgid "Task Cancellation"
+#~ msgstr "Cancelación de tarea"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Mensaje de tarea erróneo"
+
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "<b>%s</b> ha publicado la información de disponibilidad."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Información de disponibilidad"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> pide su información de disponibilidad."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Petición de disponibilidad"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> ha contestado a una petición de disponibilidad."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Respuesta sobre disponibilidad"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Mensaje de disponibilidad erróneo"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Este mensaje solo contiene peticiones no soportadas."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "El adjunto no contiene un calendario de mensaje válido"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "El adjunto no tiene elementos de calendario visibles"
+
+#~ msgid "Unable to find any of your identities in the attendees list!\n"
+#~ msgstr ""
+#~ "¡No pude encontrar ninguna de tus identidades en la lista de participantes!\n"
+
+#~ msgid "Event information"
+#~ msgstr "Información del evento"
+
+#~ msgid "Task information"
+#~ msgstr "Información de la tarea"
+
+#~ msgid "Journal information"
+#~ msgstr "Información de la entrada de diario"
+
+#~ msgid "Free/Busy information"
+#~ msgstr "Información de disponibilidad"
+
+#~ msgid "Calendar information"
+#~ msgstr "Información del calendario"
+
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Información de disponibilidad (de %s a %s)"
+
+#~ msgid "iCalendar information"
+#~ msgstr "Información de iCalendar"
+
+#~ msgid "Task"
+#~ msgstr "Tarea"
+
+#~ msgid "Status: %s"
+#~ msgstr "Estado: %s"
+
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Porcentaje Completado: %i"
+
+#~ msgid "URL: %s"
+#~ msgstr "URL: %s"
+
+#~ msgid "Categories: %s"
+#~ msgstr "Categorías: %s"
+
+#~ msgid "Contacts: "
+#~ msgstr "Contactos: "
+
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "Tipo inválido en el contenido del cuerpo, esperando una cadena"
+
+#, fuzzy
+#~ msgid "Error hashing password."
+#~ msgstr "Error añadiendo tarjeta"
+
+#, fuzzy
+#~ msgid "Invalid password."
+#~ msgstr "Argumento inválido"
+
+#, fuzzy
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Error al buscar el certificado para «%s»."
+
+#, fuzzy
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Error al buscar el certificado para «%s»."
+
+#, fuzzy
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "No pude crear un contexto de cifrado PGP."
+
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "No pude conectar con el servidor: %s"
+
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "No pude guardar el archivo de firma."
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Por favor introduzca la contraseña NNTP para %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "El servidor rechazo el nombre de usuario"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Fallo al enviar el nombre de usuario al servidor"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "El servidor rechazo el nombre de usuario ó la contraseña"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Error interno: uid en formato no válido: %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "No pude obtener la lista de grupos del servidor."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "No pude cargar el archivo de listas de grupos para %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "No pude guardar el archivo de listas de grupos para %s: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "No pude encontrar la dirección 'De' en el mensaje"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "No puedo enviar el mensaje: dirección del remitente no definida."
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Componente Evolution para el resumen de trabajo."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "No puedo inicializar el componente de resumen de Evolution."
+
+#, fuzzy
+#~ msgid "Select a service"
+#~ msgstr "Elija un archivo"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "Enviar un correo"
+
+#, fuzzy
+#~ msgid "Run %s"
+#~ msgstr "Ejecutar"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/nautilus-window.c:1267
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Cerrar"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "Mueve esta carpeta a otro sitio"
+
+# src/file-manager/dfos-xfer.c:961
+#, fuzzy
+#~ msgid "Move %s to the right"
+#~ msgstr "Moviendo archivos a la Papelera"
+
+#, fuzzy
+#~ msgid "page"
+#~ msgstr "Página"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No puedo renombrar la carpeta:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr "Error cargando %s"
+
+#, fuzzy
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Factoría para el componente de Resumen de Correo."
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Resumen"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Factoría para el compositor de correo de Evolution."
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "Factoría para el componente de Resumen de Correo."
+
+# src/nautilus-window-toolbars.c:161
+#, fuzzy
+#~ msgid "Test service"
+#~ msgstr "Servicios web"
+
+#, fuzzy
+#~ msgid "Update now"
+#~ msgstr "Actualizar"
+
+#, fuzzy
+#~ msgid "Update every "
+#~ msgstr "_Actualizar Libre/Ocupado"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Escribir URI de la carpeta"
+
+#~ 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"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Filtrar según la lista de correo"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/fm-directory-view.c:1865
+#~ msgid "Default"
+#~ msgstr "Predeterminado"
+
+#~ msgid "Indexing:"
+#~ msgstr "Indexando:"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Formato Mailbox"
+
+#~ msgid " (default)"
+#~ msgstr " (predeterminada)"
+
+#~ msgid "Mail Settings"
+#~ msgstr "Configuración del correo"
+
+#~ msgid "Subject is %s"
+#~ msgstr "Asunto es %s"
+
+#~ msgid "Mail from %s"
+#~ msgstr "Correo de %s"
+
+#~ msgid "%s mailing list"
+#~ msgstr "lista de correo %s"
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Entrada"
+
+#~ msgid "Account"
+#~ msgstr "Cuenta"
+
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr "Siempre cifrarm_e a mí mismo cuando envíe correo cifrado"
+
+#~ msgid "Composer"
+#~ msgstr "Nuevo"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "El estilo predeterminado de Reenvío es: "
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# libnautilus-private/nautilus-global-preferences.c:149
+#~ msgid "Display"
+#~ msgstr "Mostrar"
+
+#~ msgid "Drafts"
+#~ msgstr "Borradores"
+
+#~ msgid "Edit..."
+#~ msgstr "Editar..."
+
+#~ msgid "HTML signature file:"
+#~ msgstr "Archivo de firma en HTML:"
+
+#~ msgid "News"
+#~ msgstr "Noticias"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Seleccione un archivo de actividad para los filtros..."
+
+#~ msgid "Sent"
+#~ msgstr "Enviado"
+
+#~ msgid "Sources"
+#~ msgstr "Fuentes"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Registrar acciones de _los filtros en:"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "_Server type: "
+#~ msgstr "Tipo de _servidor: "
+
+#~ msgid "placeholder"
+#~ msgstr "placeholder"
+
+#~ msgid "seconds."
+#~ msgstr "segundos."
+
+#~ 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."
+
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolution no reconoce este tipo de mensajes firmados."
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr "Este mensaje está firmado digitalmente y es auténtico."
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Mensaje cifrado no mostrado"
+
+#, fuzzy
+#~ msgid "Mail Summary"
+#~ msgstr "Resumen de correo"
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "No puedo inicializar el componente de resumen de Evolution."
+
+#~ msgid " F"
+#~ msgstr " F"
+
+#~ msgid " C"
+#~ msgstr " C"
+
+#~ msgid "knots"
+#~ msgstr "nudos"
+
+#~ msgid "kph"
+#~ msgstr "kph"
+
+#~ msgid "inHg"
+#~ msgstr "inHg"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "millas"
+
+#~ msgid "kilometers"
+#~ msgstr "kilómetros"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution notes component."
+#~ msgstr "Factoría para el compositor de correo de Evolution."
+
+#, fuzzy
+#~ msgid "Factory for the Notes control"
+#~ msgstr "Factoría para el control de tareas de Evolution."
+
+#~ msgid "Outbox"
+#~ msgstr "Salida"
+
+#~ msgid "Evolution "
+#~ msgstr "Evolution "
+
+#, fuzzy
+#~ msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
+#~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No puedo transferir la carpeta:\n"
+#~ "%s"
+
+#~ msgid "(No name)"
+#~ msgstr "(Sin nombre)"
+
+#~ msgid "Dump"
+#~ msgstr "Volcar"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Configurar las opciones del calendario"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Crear un nuevo _evento de todo el día"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Crear una nueva _tarea"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Crear una _nueva cita"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "_Appointment..."
+#~ msgstr "Cit_a..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Configuración del calendario..."
+
+#, fuzzy
+#~ msgid "_Meeting..."
+#~ msgstr "Reunión"
+
+#~ msgid "_Task..."
+#~ msgstr "_Tarea..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Crear o editar cuentas de correo y otras preferencias"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Configuración del correo..."
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Aplicar filtro"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Configurar la vista de las tareas"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Configuración de las tareas..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Cambiar las propiedades del resumen"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "_Configuración del resumen..."
+
+#~ msgid "Show All"
+#~ msgstr "Mostrar todo"
+
+#~ msgid "Sear_ch"
+#~ msgstr "Bus_car"
author	JP Rosevear <jpr@ximian.com>	2002-05-08 21:37:33 +0800
committer	JP Rosevear <jpr@src.gnome.org>	2002-05-08 21:37:33 +0800
commit	b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06 (patch)
tree	5cb241d8ec2ea0a75d38ad395bd3578089e3250c /po/es.po
parent	d02b29d95446c200856d69d0bf0abe856ed7a96f (diff)
download	gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.gz gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.bz2 gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.lz gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.xz gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.tar.zst gsoc2013-evolution-b2b9661b6b48ac5f5df02d2cebc82e94ddcc6f06.zip