Updated Spanish translation.

2004-05-22 Francisco Javier F. Serrador <serrador@cvs.gnome.org> * es.po: Updated Spanish translation. svn path=/trunk/; revision=26050
author: Francisco Javier F. Serrador <serrador@cvs.gnome.org> 2004-05-23 04:35:07 +0800
committer: Francisco Javier Fernandez Serrador <serrador@src.gnome.org> 2004-05-23 04:35:07 +0800
commit: f3f19a97d77a28380183dab7eb0d842887289be4 (patch)
tree: 40b136b57482c641bf16242ab49b3422476d70a0 /po/es.po
parent: b84fb23be76e50e45d9e0b9c611dc5b516af52ee (diff)
download: gsoc2013-evolution-f3f19a97d77a28380183dab7eb0d842887289be4.tar.gz
gsoc2013-evolution-f3f19a97d77a28380183dab7eb0d842887289be4.tar.zst
gsoc2013-evolution-f3f19a97d77a28380183dab7eb0d842887289be4.zip
1 files changed, 962 insertions, 898 deletions
diff --git a/po/es.po b/po/es.po
index 4377339116..a239797d45 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,14 +14,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
-"PO-Revision-Date: 2004-05-10 14:11+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-22 21:54+0200\n"
+"PO-Revision-Date: 2004-05-22 22:33+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "serrador@hispalinux.es>\n"
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
@@ -64,13 +64,13 @@ msgstr "tarjeta"
 msgid "Default Sync Address:"
 msgstr "Dirección de sincr. predeterminada:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "No se pudo cargar la libreta de direcciones"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "No se pudo leer el bloque de la aplicación de Direcciones del Pilot"
 
@@ -125,9 +125,9 @@ msgstr "Grupo de _contactos"
 msgid "Create a new contacts group"
 msgstr "Crea un grupo de contactos nuevo"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
-msgstr ""
+msgstr "Falló al actualizar la configuración de la libreta o las carpetas."
 
 #: addressbook/gui/component/addressbook-config.c:483
 msgid "Failed to connect to LDAP server"
@@ -158,47 +158,51 @@ msgid "Server did not respond with valid schema information"
 msgstr "El servidor no respondió con una información del esquema válida"
 
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Migrando..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando «%s»:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#. On This Computer is always first and VFolders is always last
+#: addressbook/gui/component/addressbook-migrate.c:508
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+#: mail/mail-component.c:247 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "En este equipo"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
+#: addressbook/gui/component/addressbook-migrate.c:516
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Privado"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:524
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:652
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:772
 msgid "Autocompletion Settings"
 msgstr "Configuración de autocompletado"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1148
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -210,7 +214,7 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -220,7 +224,7 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1171
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -230,7 +234,7 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1181
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -241,6 +245,12 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus datos Pilot Sync..."
 
+#: addressbook/gui/component/addressbook-migrate.c:1194
+msgid ""
+"Some fields are no longer representable in the contact editor. Please wait "
+"while Evolution copies those fields to the 'Notes' field..."
+msgstr "Algunos campos no se pueden representar más en el editor de contactos. Por favor espere mientras Evolution copia esos campos al campo «Notas»..."
+
 #: addressbook/gui/component/addressbook-view.c:674
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
@@ -270,6 +280,7 @@ msgstr "Propiedades..."
 #. can not get name, should be a bug of e-book.Anyway, should set a default name.
 #.
 #. name = e_book_get_name (book);
+#. Create the contacts group
 #: addressbook/gui/component/addressbook-view.c:1002
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
@@ -301,16 +312,15 @@ msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "*Control*F2"
-msgstr ""
+msgstr "*Control*F2"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Autocompletado"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
 msgid "C_ontacts"
-msgstr "Contactos"
+msgstr "C_ontactos"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
@@ -371,7 +381,7 @@ msgstr " Mo_strar bases soportadas "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -439,7 +449,7 @@ msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
 #: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Siempre"
 
@@ -484,14 +494,11 @@ msgstr "Dirección de correo-e:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution usará este Nombre Distintivo para autenticarle con el servidor"
+msgstr "Evolution usará este Nombre Distintivo para autenticarle con el servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution usará esta dirección de correo-e para autenticarle con el servidor"
+msgid "Evolution will use this email address to authenticate you with the server"
+msgstr "Evolution usará esta dirección de correo-e para autenticarle con el servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
@@ -500,12 +507,12 @@ msgstr "Encontrar bases de búsqueda posibles"
 #: addressbook/gui/component/ldap-config.glade.h:31
 #: calendar/gui/dialogs/calendar-setup.glade.h:6
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
 #: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nunca"
 
@@ -668,8 +675,7 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:67
 msgid "This option controls how long a search will be run."
-msgstr ""
-"Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
+msgstr "Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
 
 #: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Timeout:"
@@ -688,7 +694,7 @@ msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
 #: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
@@ -714,7 +720,7 @@ msgid "_Log in method:"
 msgstr "Método de _inicio de sesión:"
 
 #: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nombre:"
 
@@ -761,7 +767,7 @@ msgstr "General"
 #: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/alarm-options.glade.h:14
 #: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutos"
 
@@ -820,8 +826,7 @@ msgstr "Fuente"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 msgid "Evolution Addressbook name selection interface"
-msgstr ""
-"Interfaz de selección de nombre de la libreta de direcciones de Evolution"
+msgstr "Interfaz de selección de nombre de la libreta de direcciones de Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -880,7 +885,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Trabajo</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 #: addressbook/gui/widgets/eab-contact-display.c:342
 #: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "AIM"
@@ -916,7 +921,7 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -924,7 +929,7 @@ msgid "Contact"
 msgstr "Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:519
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -945,7 +950,7 @@ msgid "Full _Name..."
 msgstr "_Nombre completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Domicilio"
@@ -955,63 +960,62 @@ msgid "Home Page:"
 msgstr "Página personal:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Job title:"
-msgstr "Puesto:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:930
 msgid "Location:"
 msgstr "Lugar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Mailing Address"
 msgstr "Dirección de correo-e"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Manager:"
 msgstr "Jefe:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Ni_ckname:"
 msgstr "_Apodo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Notes:"
 msgstr "Notas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "PO Box:"
-msgstr "_Apdo. de correos:"
+msgstr "Apdo. de correos:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Profession:"
 msgstr "Profesión:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "State/Province:"
 msgstr "Estado/Provincia:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Title:"
+msgstr "Tratamiento:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Quiere recibir el correo como HTML"
@@ -1022,10 +1026,10 @@ msgstr "Webcam:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:194
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Trabajo"
 
@@ -1053,7 +1057,7 @@ msgstr "item7"
 msgid "item8"
 msgstr "item8"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1061,7 +1065,7 @@ msgstr ""
 "¿Está seguro de que quiere\n"
 "borrar estos contactos?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1076,7 +1080,7 @@ msgid "Address"
 msgstr "Dirección"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
@@ -2057,86 +2061,99 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/widgets/eab-contact-display.c:345
 #: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/widgets/eab-contact-display.c:347
 #: addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
 #: addressbook/gui/widgets/eab-contact-display.c:346
 #: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: addressbook/gui/widgets/eab-contact-display.c:344
 #: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "Libro fuente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "Libro destino"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "Es un contacto nuevo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 msgid "Changed"
 msgstr "Modificados"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:2294
 msgid "Category editor not available."
 msgstr "No hay un editor de categorías disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2302
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertenece a estas categorías:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2379
 msgid "Please select an image for this contact"
-msgstr "Por favor selecciona entre las siguientes opciones"
+msgstr "Por favor seleccione una imagen para este contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2383
 msgid "No image"
-msgstr "Nome"
+msgstr "Sin imagen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2560
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr "Está moviendo un contacto desde una libreta a otra, pero no puede ser eliminado de la de origen. ¿Quiere guardar una copia en vez de mover?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2607
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
+"\n"
+msgstr ""
+"La fecha del contacto es inválida:\n"
 "\n"
-msgstr "Las siguientes conexiones están actualmente activas:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "No se pudo encontrar el widget para el campo: «%s»"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr "El contacto no puede ser guardado en la libreta de direcciones seleccionada. ¿Quiere descartar estos cambios?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2704
+#: addressbook/gui/contact-editor/e-contact-editor.c:2728
+#: addressbook/gui/widgets/eab-gui-util.c:208
+msgid "_Discard"
+msgstr "_Descartar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2169,7 +2186,7 @@ msgid "_Edit Full"
 msgstr "_Editar todo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Nombre _completo:"
 
@@ -2312,8 +2329,7 @@ msgstr "_Nombre de la lista:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
+msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
@@ -2631,13 +2647,11 @@ msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:174
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"El soporte de esta libreta de direcciones no pudo analizar esta consulta."
+msgstr "El soporte de esta libreta de direcciones no pudo analizar esta consulta."
 
 #: addressbook/gui/widgets/eab-gui-util.c:177
 msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
+msgstr "El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
 
 #: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "This query did not complete successfully."
@@ -2647,10 +2661,6 @@ msgstr "Esta consulta no se completó con éxito."
 msgid "Do you want to save changes?"
 msgstr "¿Desea guardar los cambios?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Descartar"
-
 #: addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error adding list"
 msgstr "Error añadiendo lista"
@@ -2869,7 +2879,7 @@ msgstr "Avanzado..."
 #: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:250
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipo"
@@ -2880,11 +2890,10 @@ msgstr "Libreta de direcciones"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
-#, fuzzy
 msgid "Save as VCard..."
-msgstr "Guardar como VCard"
+msgstr "Guardar como VCard..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
@@ -3083,7 +3092,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:257
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
@@ -3191,17 +3200,17 @@ msgstr "Vista de la tarjeta"
 msgid "GTK Tree View"
 msgstr "Vista de árbol GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
 msgid "Reflow Test"
 msgstr "Test de reflujo"
 
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright © 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
 msgid "This should test the reflow canvas item"
 msgstr "Esto debería probar el reflujo del elemento lienzo"
 
@@ -3225,12 +3234,12 @@ msgstr "Importador de VCard de Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
@@ -3448,8 +3457,7 @@ msgid "Export in asynchronous mode "
 msgstr "Exportar en modo asíncrono"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
+msgid "The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 "El número de tarjetas en un archivo de salida en modo asíncrono, tamaño por "
 "omisión 100."
@@ -3459,8 +3467,7 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Error en los argumentos de la línea de comandos, por favor use la opción --"
 "help para ver el uso."
@@ -3755,7 +3762,7 @@ msgstr "La semana empieza el día"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Whether or not to use the notification tray for display alarms"
-msgstr ""
+msgstr "Indica si se debe usar o no la bandeja de notificación para mostrar alarmas"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
@@ -3771,18 +3778,15 @@ msgstr "Indica si debe ocultar las áreas terminadas"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
-msgstr ""
-"Indica si debe establecer un recordatorio predeterminado para los eventos"
+msgstr "Indica si debe establecer un recordatorio predeterminado para los eventos"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
-msgstr ""
-"Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
+msgstr "Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
-msgstr ""
-"Indica si debe mostrar los números de la semana en el navegador de fechas"
+msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
 #: calendar/gui/dialogs/select-source-dialog.c:88
@@ -3818,6 +3822,10 @@ msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
@@ -3855,9 +3863,8 @@ msgid "New Calendar"
 msgstr "Agenda nueva"
 
 #: calendar/gui/calendar-component.c:623
-#, fuzzy
 msgid "Failed upgrading calendars."
-msgstr "Cargando agenda..."
+msgstr "Fallo al actualizar agendas."
 
 #: calendar/gui/calendar-component.c:917
 #, c-format
@@ -4082,7 +4089,7 @@ msgstr "Reproducir un sonido"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
-msgstr ""
+msgstr "Mostrar una alerta emergente"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Reminders"
@@ -4099,7 +4106,7 @@ msgstr "Enviar un correo-e"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4181,7 +4188,7 @@ msgstr "C_olor:"
 msgid "Calendar Properties"
 msgstr "Propiedades de la agenda"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Elija un color"
 
@@ -4323,7 +4330,7 @@ msgid "Display"
 msgstr "Mostrar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Activar"
 
@@ -4333,7 +4340,7 @@ msgstr "Publicación de disponibilidad"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:557
 msgid "Friday"
 msgstr "Viernes"
 
@@ -4347,7 +4354,7 @@ msgstr "minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:553
 msgid "Monday"
 msgstr "Lunes"
 
@@ -4357,7 +4364,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:558
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -4371,7 +4378,7 @@ msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:552
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4385,7 +4392,7 @@ msgstr "_Jue"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:556
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -4399,7 +4406,7 @@ msgstr "Formato de la hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:554
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -4409,7 +4416,7 @@ msgstr "La _semana empieza en:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:555
 msgid "Wednesday"
 msgstr "Miércoles"
 
@@ -4442,7 +4449,7 @@ msgid "_Day begins:"
 msgstr "La jornada laboral _comienza a las:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4473,8 +4480,7 @@ msgstr "_Sáb"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 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"
+msgstr "Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
@@ -4733,8 +4739,7 @@ msgstr "La tarea no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr ""
-"La entrada del diario no pudo ser borrada porque el permiso fue denegado"
+msgstr "La entrada del diario no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
@@ -4884,12 +4889,17 @@ msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
 #. an empty string is the same as 'None'
+#. add a "None" option to the stores menu
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
 #: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4916,7 +4926,7 @@ msgstr "_Delegado a..."
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4924,7 +4934,7 @@ msgid "_Delete"
 msgstr "_Borrar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Participantes"
@@ -4960,14 +4970,14 @@ msgid "Member"
 msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Confirmar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
+#: calendar/gui/e-meeting-list-view.c:271
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
@@ -5029,18 +5039,15 @@ msgstr "Nombre de la lista de tareas"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr ""
-"Está modificando un acontecimiento que se repite, ¿qué quiere modificar?"
+msgstr "Está modificando un acontecimiento que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Está modificando una tarea que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr ""
-"Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgstr "Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -5190,9 +5197,8 @@ msgid "Save Event"
 msgstr "Guardar acontecimiento"
 
 #: calendar/gui/dialogs/select-source-dialog.c:65
-#, fuzzy
 msgid "Select destination"
-msgstr "Seleccione destino %s"
+msgstr "Seleccione destino"
 
 #: calendar/gui/dialogs/select-source-dialog.c:86
 msgid "_Destination"
@@ -5214,8 +5220,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
-msgstr ""
-"La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
+msgstr "La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
 
 #: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
@@ -5240,7 +5245,7 @@ msgstr "Terminado"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Alta"
 
@@ -5254,14 +5259,14 @@ msgstr "En proceso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Baja"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5318,8 +5323,8 @@ msgstr "Con_fidencial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descripción:"
 
@@ -5482,7 +5487,7 @@ msgstr "Fecha de vencimiento:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:944
 msgid "Status:"
 msgstr "Estado:"
 
@@ -5605,8 +5610,8 @@ msgstr "C_ortar"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
 #: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
@@ -5754,9 +5759,9 @@ msgstr "Fecha de inicio"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-meeting-list-view.c:145
+#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5782,13 +5787,13 @@ msgid "Assigned"
 msgstr "Asignado"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Sí"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "No"
 
@@ -5819,12 +5824,20 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5855,6 +5868,10 @@ msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. month, %B = full month name. You can change the
+#. order but don't change the specifiers or add
+#. anything.
 #: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5862,6 +5879,9 @@ msgstr "%A %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
 #: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5872,102 +5892,102 @@ msgstr "%d de %b"
 msgid "%02i minute divisions"
 msgstr "%02i divisiones por minuto"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:586
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetición compuesta)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:597
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada día"
 msgstr[1] "Cada %d días"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:602
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Cada semana"
 msgstr[1] "Cada %d semanas"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:604
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Cada semana en"
 msgstr[1] "Cada %d semanas en"
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:612
 msgid " and "
 msgstr " y "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:619
 #, c-format
 msgid "The %s day of "
 msgstr "El %s día de "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:632
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de"
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:639
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "cada mes"
 msgstr[1] "cada %d meses"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:643
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada año"
 msgstr[1] "Cada %d años"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:654
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "un total de %d vez"
 msgstr[1] " un total de %d veces"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:663
 msgid ", ending on "
 msgstr ", terminando en "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:687
 msgid "<b>Starts:</b> "
 msgstr "<b>Empieza:</b>"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:697
 msgid "<b>Ends:</b> "
 msgstr "<b>Termina:</b>"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:717
 msgid "<b>Completed:</b> "
 msgstr "<b>Completado:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:727
 msgid "<b>Due:</b> "
 msgstr "<b>Vencimiento:</b>"
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
 msgid "iCalendar Information"
 msgstr "Información de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:782
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:904
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5975,304 +5995,303 @@ msgstr ""
 "<br> Revise la siguiente información y seleccione una acción del menú de "
 "abajo."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Ninguna</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Rechazado"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
+#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado información de reunión."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Información de reunió"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita la presencia de %s en una reunión."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1201
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1199
 #, 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:1206
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Actualización de reunión"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la última información de la reunión."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Solicitud de actualización de la reunión"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ha contestado a la solicitud de reunión."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1220
 #, 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:1227
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Cancelación de reunión"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, 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:1235
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1254
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pide a %s que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1262
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> le pide que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea añadirse a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1279
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Solicitud de actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1280
 #, 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:1287
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Cancelación de tarea"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1316
 #, 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:1323
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1321
 #, 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:1328
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Solicitud de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ha contestado a una solicitud de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sólo contiene solicitudes no soportadas."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de agenda válido"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1529
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de agenda visibles"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1763
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
 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"
+msgstr "El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
 msgid "Object is invalid and cannot be updated\n"
 msgstr "El objeto es inválido y no puede ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1819
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1831
 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:1856
+#: calendar/gui/e-itip-control.c:1850
 msgid "There was an error on the CORBA system\n"
 msgstr "Hubo un error en el sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1853
 msgid "Object could not be found\n"
 msgstr "El objeto no pudo encontrarse\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1856
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "No tiene los permisos necesarios para actualizar la agenda\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1862
 msgid "Attendee status could not be updated!\n"
 msgstr "El estado de asistencia no pudo ser actualizado.\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1893
 msgid "Removal Complete"
 msgstr "Eliminación terminada"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo ser enviado.\n"
 
@@ -6318,7 +6337,7 @@ msgid "Chair Persons"
 msgstr "Presidencia"
 
 #: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:480
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
@@ -6330,57 +6349,57 @@ msgstr "Participantes opcionales"
 msgid "Resources"
 msgstr "Recursos"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Sala"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Presidente"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Participante requerido"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "No participan"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Necesita acción"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Provisional"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegado"
@@ -6458,6 +6477,10 @@ 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.
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
 #: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6466,6 +6489,10 @@ msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6557,11 +6584,11 @@ msgstr "Compactando"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "*Control*F3"
-msgstr ""
+msgstr "*Control*F3"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "*Control*F4"
-msgstr ""
+msgstr "*Control*F4"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
@@ -6596,9 +6623,8 @@ msgid "Evolution's Tasks component"
 msgstr "Componente de Tareas de Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
 msgid "_Calendars"
-msgstr "Agendas"
+msgstr "_Agendas"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 #: views/tasks/galview.xml.h:3
@@ -6751,19 +6777,19 @@ msgstr "En la web"
 #. FIXME: set proper domain/code
 #: calendar/gui/migration.c:708 calendar/gui/migration.c:840
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
+msgstr "No es posible migrar la configuración antigua desde evolution/config.xmldb"
 
 #. FIXME: domain/code
 #: calendar/gui/migration.c:737
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to migrate calendar `%s'"
-msgstr "No se pudo abrir la agenda «%s»."
+msgstr "No se pudo migrar la agenda «%s»."
 
 #. FIXME: domain/code
 #: calendar/gui/migration.c:869
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr "No es posible abrir las tareas en «%s»."
+msgstr "No es posible migrar las tareas en «%s»."
 
 #: calendar/gui/print.c:489
 msgid "1st"
@@ -7012,7 +7038,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7020,15 +7046,13 @@ msgstr[0] ",%d seleccionado"
 msgstr[1] ",%d seleccionados"
 
 #: calendar/gui/tasks-component.c:447
-#, fuzzy
 msgid "Failed upgrading tasks."
-msgstr "Cargando tareas"
+msgstr "Fallo al actualizar las tareas."
 
 #: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
+msgstr "No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
 
 #: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
@@ -8724,8 +8748,7 @@ msgstr "Resincronizando con el servidor"
 
 #: camel/camel-disco-folder.c:41
 msgid "Copy folder content locally for offline operation"
-msgstr ""
-"Copiar el contenido de la carpeta localmente para operación desconectada"
+msgstr "Copiar el contenido de la carpeta localmente para operación desconectada"
 
 #: camel/camel-disco-folder.c:103
 msgid "Downloading new messages for offline mode"
@@ -8829,12 +8852,12 @@ msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operación no implementada: añadir mensaje: para %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Operación no implementada: búsqueda según la expresión: para %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Operación no implementada: búsqueda por uids: para %s"
@@ -8847,11 +8870,15 @@ msgstr "Moviendo mensajes"
 msgid "Copying messages"
 msgstr "Copiando mensajes"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr "Aprendizaje de mensaje(s) de spam/no spam"
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Aprendiendo spam"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Aprendiendo no-spam"
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Filtrando mensajes(s) nuevo(s)"
 
@@ -8879,21 +8906,19 @@ msgstr "(coincidir con todas) requiere un único resultado booleano"
 
 #: camel/camel-folder-search.c:755
 msgid "(match-threads) not allowed inside match-all"
-msgstr ""
+msgstr "(coincidir-conversaciones) no se permite dentro de «coincidir-todo»"
 
 #: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
 msgid "(match-threads) requires a match type string"
-msgstr ""
+msgstr "(coincidir-conversaciones) requiere una cadena de coincidencia"
 
 #: camel/camel-folder-search.c:785
-#, fuzzy
 msgid "(match-threads) expects an array result"
-msgstr "(coincidir con todas) requiere un único resultado booleano"
+msgstr "(coincidir-conversaciones) espera un resultado array"
 
 #: camel/camel-folder-search.c:791
-#, fuzzy
 msgid "(match-threads) requires the folder set"
-msgstr "(coincidir con todas) requiere un único resultado booleano"
+msgstr "(coincidir-conversaciones) requiere que se establezca una carpeta"
 
 #: camel/camel-folder-search.c:880
 #, c-format
@@ -8930,7 +8955,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
@@ -8990,8 +9015,7 @@ msgstr "Esta parte del mensaje está firmada digitalmente"
 #: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
 #: camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr ""
-"No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
+msgstr "No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
 
 #: camel/camel-gpg-context.c:1413
 #, c-format
@@ -9025,8 +9049,7 @@ msgstr "No se pudo bloquear el archivo para %s: %s"
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
+msgstr "Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -9227,8 +9250,7 @@ msgstr "Reto del servidor no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr ""
-"El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
+msgstr "El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -9236,8 +9258,7 @@ msgstr "La respuesta del servidor no contenía información de autorización\n"
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr ""
-"La respuesta del servidor contenía información de autorización incompleta\n"
+msgstr "La respuesta del servidor contenía información de autorización incompleta\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -9298,8 +9319,7 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
-msgstr ""
-"El manipulador de contexto suministrado no se refiere a un contexto válido."
+msgstr "El manipulador de contexto suministrado no se refiere a un contexto válido."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
@@ -9316,7 +9336,7 @@ msgstr "Las credenciales referenciadas han expirado."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1243
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
@@ -9512,7 +9532,6 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "No se puede añadir el atributo SMIMEEncKeyPrefs"
 
 #: camel/camel-smime-context.c:354
-#, fuzzy
 msgid "Cannot add encryption certificate"
 msgstr "No se puede añadir el certificado de cifrado"
 
@@ -9593,12 +9612,10 @@ msgid "Certificate import failed"
 msgstr "Falló en la importación del certificado"
 
 #: camel/camel-smime-context.c:628
-#, fuzzy
 msgid "Certificate only message, cannot verify certificates"
 msgstr "Mensaje sólo de certificado, no se pueden verificar los certificados"
 
 #: camel/camel-smime-context.c:631
-#, fuzzy
 msgid "Certificate only message, certificates imported and verified"
 msgstr "Mensaje sólo de certificado, certificados importados y verificados"
 
@@ -9678,40 +9695,40 @@ msgstr "importación de claves: no implementado"
 msgid "export keys: unimplemented"
 msgstr "exportación de claves: no implementado"
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:215
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No se pudo obtener la carpeta: Operación no válida en este almacén"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:245
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:299
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No se pudo crear la carpeta: Operación no válida en este almacén"
 
-#: camel/camel-store.c:323
-#, fuzzy, c-format
+#: camel/camel-store.c:327
+#, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:391 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No se pudo borrar la carpeta: %s: Operación no válida"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:441 camel/camel-vee-store.c:390
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No se pudo renombrar la carpeta: %s: Operación no válida"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:813
 msgid "Trash"
 msgstr "Papelera"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
 
@@ -9729,8 +9746,7 @@ msgstr "No se pudo descifrar la firma del certificado"
 
 #: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr ""
-"No se pudo descifrar la firma de la Lista de Revocación de Certificados"
+msgstr "No se pudo descifrar la firma de la Lista de Revocación de Certificados"
 
 #: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
@@ -10004,7 +10020,7 @@ msgstr "Para acceder a servidores Novell Groupwise"
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Contraseña"
 
@@ -10072,8 +10088,7 @@ msgstr "No se pudo compactar la carpeta «%s»: Comando erróneo"
 #: camel/providers/imap4/camel-imap4-folder.c:616
 #, c-format
 msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"No se pudo obtener el mensaje; %s de la carpeta «%s»: No existe dicho mensaje"
+msgstr "No se pudo obtener el mensaje; %s de la carpeta «%s»: No existe dicho mensaje"
 
 #: camel/providers/imap4/camel-imap4-folder.c:621
 #, c-format
@@ -10148,8 +10163,7 @@ msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
 msgstr "Para leer y almacenar correo en los servidores IMAPv4rev. EXPERIMENTAL"
 
 #: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
 "Esta opción conectará con el servidor IMAPv4rev1 usando una contraseña de "
 "texto plano."
@@ -10168,8 +10182,8 @@ msgstr "Servicio IMAP para %s en %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:572
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -10180,15 +10194,15 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "No se pudo conectar con %s (puerto %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL no disponible"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:569
+#: camel/providers/imap/camel-imap-store.c:846
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10206,8 +10220,8 @@ msgstr ""
 "STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
 #: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:711
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Falló al conectar al servidor IMAP %s en modo seguro: %s"
@@ -10216,14 +10230,13 @@ msgstr "Falló al conectar al servidor IMAP %s en modo seguro: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
 msgid "Unknown error"
 msgstr "Error desconocido"
 
 #: camel/providers/imap4/camel-imap4-store.c:373
 #, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr ""
 "No se pudo autenticar con el servidor IMAP %s usando el mecanismo de "
 "autenticación %s"
@@ -10244,13 +10257,11 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "No se pudo obtener la carpeta «%s» en el servidor IMAP %s: Desconocido"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1888
+#: camel/providers/imap/camel-imap-store.c:2266
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"El nombre de la carpeta «%s» es inválido porque contiene elcarácter «%c»"
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "El nombre de la carpeta «%s» es inválido porque contiene elcarácter «%c»"
 
 #: camel/providers/imap4/camel-imap4-store.c:826
 #, c-format
@@ -10325,12 +10336,12 @@ msgstr "El servidor IMAP %s se desconectó inesperadamente: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3199
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3202
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconectó inesperadamente: %s"
@@ -10394,13 +10405,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "No se pudo descargar el mensaje: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10410,14 +10414,14 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "No existe ese mensaje"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/imap/camel-imap-folder.c:2622
 #: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
@@ -10427,7 +10431,22 @@ msgstr "Este mensaje no está disponible actualmente"
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo información de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr "Respuesta del servidor incompleta: no hay información proporcionada para el mensaje %d"
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr "Respuesta incompleta del servidor: No se proporcionó un UID para el mensaje %d"
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr "Respuesta inesperada del servidor: Se proporcioneron UIDs idénticos para los mensajes %d y %d"
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "No se pudo encontrar el cuerpo del mensaje en la respuesta de FETCH."
 
@@ -10487,43 +10506,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para leer y almacenar correo en los servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Extensión SSL/TLS no implementada."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:712
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Falló la negociación SSL"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:849
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "No se pudo conectar con el comando «%s»: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1273
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "El servidor IMAP %s no soporta el método de autenticación requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1283
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No hay soporte para el tipo de autenticación %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1306
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s escriba la contraseña IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1320
 msgid "You didn't enter a password."
 msgstr "No introdujo una contraseña."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1349
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10534,18 +10553,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1870
+#: camel/providers/imap/camel-imap-store.c:2060
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1946
+#: camel/providers/imap/camel-imap-store.c:2327
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:2001
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10553,7 +10572,7 @@ msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "No se pudo crear la carpeta: %s: la carpeta existe."
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2277
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Carpeta padre desconocida: %s"
@@ -10737,9 +10756,26 @@ msgstr "Mensaje añadido al Maildir cancelado"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No se pudo añadir el mensaje a la carpeta tipo maildir: %s: %s"
 
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"No se pudo obtener el mensaje; %s de la carpeta %s\n"
+"  %s"
+
 #
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Contenido inválido en el mensaje"
 
@@ -10829,24 +10865,14 @@ msgstr "Adición de mensaje cancelada"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No se pudo añadir el mensaje al archivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"No se pudo obtener el mensaje; %s de la carpeta %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La carpeta parece estar corrompida e irrecuperable."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Falló la construcción del mensaje: ¿Buzón corrompido?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+msgid "Message construction failed."
+msgstr "Falló la construcción del mensaje."
 
 #: camel/providers/local/camel-mbox-store.c:176
 #: camel/providers/local/camel-mbox-store.c:362
@@ -11192,10 +11218,8 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "No se pudo guardar el archivo de lista de grupo para %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
-"Mostrar carpetas en notación corta (ej: c.o.linux en vez de comp.os.linux)"
+msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr "Mostrar carpetas en notación corta (ej: c.o.linux en vez de comp.os.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
@@ -11270,8 +11294,7 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-store.c:792
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"No puede crear una carpeta en un almacén de noticias: suscríbase en su lugar."
+msgstr "No puede crear una carpeta en un almacén de noticias: suscríbase en su lugar."
 
 #: camel/providers/nntp/camel-nntp-store.c:800
 msgid "You cannot rename a folder in a News store."
@@ -11370,7 +11393,7 @@ msgstr "Borrar tras %s día(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Deshabilitar soporte para todas las extensiones POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11431,8 +11454,7 @@ msgstr "SASL «%s» Falló el inicio de sesión para servidor POP %s: %s"
 #: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr ""
-"No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
+msgstr "No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
 
 #: camel/providers/pop3/camel-pop3-store.c:454
 #, c-format
@@ -11460,7 +11482,7 @@ msgid "No such folder `%s'."
 msgstr "No existe la carpeta «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11468,8 +11490,7 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
-"Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
+msgstr "Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -11513,7 +11534,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entregar correo por medio de sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11567,8 +11588,7 @@ msgstr "El usuario no es local; se reenviará a <forward-path>"
 
 #: 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"
+msgstr "Acción solicitada del correo no realizada: el mailbox no está disponible"
 
 #: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
@@ -11584,8 +11604,7 @@ msgstr "El usuario no es local; pruebe con <forward-path>"
 
 #: 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"
+msgstr "Acción solicitada no realizada: la capacidad del sistema es insuficiente"
 
 #: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
@@ -11649,8 +11668,7 @@ msgstr "El comando STARTTLS ha fallado"
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, 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."
+msgstr "El servidor SMTP %s no implementa el método de autenticación requerido %s."
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
@@ -11845,8 +11863,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
 #: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No se puede firmar el mensaje saliente: No hay establecido un certificado de "
 "firma para esta cuenta"
@@ -11935,8 +11952,7 @@ msgstr ""
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr ""
-"<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+msgstr "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
 
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
@@ -12031,8 +12047,7 @@ msgstr "${1}"
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"El archivo «${0}» no es un archivo regular y no puede enviarse en un mensaje."
+msgstr "El archivo «${0}» no es un archivo regular y no puede enviarse en un mensaje."
 
 #. mail-composer:attach-directory primary
 #: composer/mail-composer-errors.xml.h:8
@@ -12095,8 +12110,7 @@ msgstr "Aviso: Mensaje modificado"
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr ""
-"¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
+msgstr "¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
 
 #. mail-composer:exit-unsaved secondary
 #: composer/mail-composer-errors.xml.h:28
@@ -12125,8 +12139,7 @@ msgstr "No se pudo crear un mensaje."
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
 msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-"Debido a «${0}», quizá necesite seleccionar diferentes opciones de correo."
+msgstr "Debido a «${0}», quizá necesite seleccionar diferentes opciones de correo."
 
 #. mail-composer:no-sig-file primary
 #: composer/mail-composer-errors.xml.h:36
@@ -12300,12 +12313,16 @@ msgstr "Sincr. de categorías:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12357,23 +12374,31 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12470,6 +12495,7 @@ msgid "Missing file name."
 msgstr "Falta el nombre de archivo."
 
 #. filter:no-file secondary
+#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Debe especificar un nombre de archivo."
@@ -12500,6 +12526,7 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "No se puede compilar la expresión regular «{1}»."
 
 #. filter:no-name primary
+#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "Falta el nombre."
@@ -12531,15 +12558,15 @@ msgstr "No se ha seleccionado ningún origen."
 
 #. filter:vfolder-no-source secondary
 #: filter/filter-errors.xml.h:36
-#, fuzzy
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting\n"
 "all local folders, all remote folders, or both."
 msgstr ""
-"Debe especificar al menos una carpeta como origen. Hágalo seleccionando las "
-"carpetas individualmente, y/o seleccionando todas las carpetas locales, "
-"todas las carpetas remotas, o ambas."
+"Debe especificar al menos una carpeta como origen.\n"
+"Hágalo seleccionando las carpetas individualmente, y/o \n"
+"seleccionando todas las carpetas locales, todas las carpetas\n"
+"remotas, o ambas."
 
 #: filter/filter-file.c:288
 msgid "Choose a file"
@@ -12555,7 +12582,7 @@ msgstr "<b>Entonces</b>"
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12611,7 +12638,7 @@ msgstr "hace"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "segundos"
 
@@ -12643,20 +12670,20 @@ msgstr "con todas las carpetas locales"
 msgid "years"
 msgstr "años"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Tareas pendientes"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Más tarde"
 
@@ -12685,24 +12712,20 @@ msgid "Execute actions"
 msgstr "Ejecutar acciones"
 
 #: filter/filter-rule.c:877
-#, fuzzy
 msgid "All related"
-msgstr "Delegado"
+msgstr "Todos los relacionados"
 
 #: filter/filter-rule.c:877
-#, fuzzy
 msgid "Replies"
-msgstr "Destinatarios"
+msgstr "Respuesta"
 
 #: filter/filter-rule.c:877
-#, fuzzy
 msgid "Replies and parents"
-msgstr "Responde a %s"
+msgstr "Respuestas y antecesores"
 
 #: filter/filter-rule.c:879
-#, fuzzy
 msgid "Include threads"
-msgstr "Incluye:"
+msgstr "Incluir conversaciones"
 
 #: filter/filter-rule.c:974
 msgid "incoming"
@@ -13097,15 +13120,14 @@ msgid "Create New Folder"
 msgstr "Crear carpeta nueva"
 
 #: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/mail-component.c:706
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
 #: mail/em-folder-selector.c:299
-#, fuzzy
 msgid "Create"
-msgstr "Crestview"
+msgstr "Crear"
 
 #: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
@@ -13122,12 +13144,12 @@ msgstr "Moviendo carpeta %s"
 msgid "Copying folder %s"
 msgstr "Copiando carpeta %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:848 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:850 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensajes a la carpeta %s"
@@ -13145,15 +13167,14 @@ msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
 #: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Mover"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
-#, fuzzy
+#: mail/em-folder-tree.c:961 mail/message-list.c:1653
 msgid "Cancel _Drag"
-msgstr "Cancelar tarea"
+msgstr "Cancelar _arrastre"
 
 #: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
@@ -13162,53 +13183,52 @@ msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
 #: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
-#, fuzzy
 msgid "C_opy"
-msgstr "Copiar"
+msgstr "C_opiar"
 
 #: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta «%s»"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2477
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar la carpeta «%s» a:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2479
 msgid "Rename Folder"
 msgstr "Renombrar carpeta"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Ver"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2551
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2560
 msgid "_New Folder..."
 msgstr "Carpeta _nueva..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2563
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
@@ -13228,8 +13248,8 @@ msgstr "Cargando..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
+#: mail/mail-component.c:556
 msgid "Mail"
 msgstr "Correo"
 
@@ -13360,7 +13380,7 @@ msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
 #: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -13459,9 +13479,8 @@ msgid "Invalid signature"
 msgstr "Firma no válida"
 
 #: mail/em-format-html.c:562
-#, fuzzy
 msgid "Valid signature but cannot verify sender"
-msgstr "Firma válida, no se puede verificar el remitente"
+msgstr "Firma válida, pero no se puede verificar el remitente"
 
 #: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
@@ -13659,7 +13678,7 @@ msgstr "Una vez por semana"
 msgid "Once per month"
 msgstr "Una vez por mes"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13671,55 +13690,51 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: mail/em-migrate.c:1506
-#, fuzzy, c-format
+#: mail/em-migrate.c:1602
+#, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr "No se pudo crear la carpeta: «%s»: %s"
+msgstr "No se pudo crear la carpeta nueva: «%s»: %s"
 
-#: mail/em-migrate.c:1532
-#, fuzzy, c-format
+#: mail/em-migrate.c:1628
+#, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr ""
-"No se pudo copiar el descriptor de archivo:  %s\n"
-"%s"
+msgstr "No se pudo copiar el la carpeta «%s» a «%s»: %s"
 
-#: mail/em-migrate.c:1715
-#, fuzzy, c-format
+#: mail/em-migrate.c:1811
+#, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "No se pudo guardar el archivo de lista de grupo para %s: %s"
+msgstr "No se pudo buscar buzones existentes en «%s»: %s"
 
-#: mail/em-migrate.c:1919
-#, fuzzy, c-format
+#: mail/em-migrate.c:2015
+#, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "No se pudo autenticarme en el servidor POP %s: %s"
+msgstr "No se pudo abrir los datos antiguos POP keep-on-server «%s»: %s"
 
-#: mail/em-migrate.c:1933
-#, fuzzy, c-format
+#: mail/em-migrate.c:2029
+#, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Fallo al crear directorio  «%s»: %s"
+msgstr "Fallo al crear directorio de datos POP3 keep-on-server  «%s»: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr ""
+msgstr "No se pudo copiar los datos POP3 keep-on-server «%s»: %s"
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
-#, fuzzy, c-format
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
+#, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "Fallo al crear directorio  «%s»: %s"
+msgstr "Fallo al crear alamcén de correo local  «%s»: %s"
 
-#: mail/em-migrate.c:2480
-#, fuzzy, c-format
+#: mail/em-migrate.c:2576
+#, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr ""
-"No se pudo crear el archivo de salida: %s\n"
-" %s"
+msgstr "No se pudo crear las carpetas de correo local en: «%s»: %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
-msgstr ""
+msgstr "No se pudo leer la configuración de la instalación anterior de Evolution, «evolution/config.xmldb» no existe o está corrompido."
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13962,9 +13977,8 @@ msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista de tipos mime de comprobación de visores de componentes bonobo"
 
 #: mail/evolution-mail.schemas.in.in.h:36
-#, fuzzy
 msgid "List of protocol names whose license has been accepted."
-msgstr "Lista de nombres de protocolos cuya licencia ha sido aceptada"
+msgstr "Lista de nombres de protocolos cuya licencia ha sido aceptada."
 
 #: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
@@ -14049,8 +14063,7 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intenta compactar una carpeta."
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intenta enviar un mensaje sin un asunto."
 
 #: mail/evolution-mail.schemas.in.in.h:57
@@ -14127,8 +14140,7 @@ msgstr "Reproducir un archivo de sonido cuando llegue correo nuevo."
 
 #: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr ""
-"Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
+msgstr "Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
 
 #: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
@@ -14280,15 +14292,14 @@ msgstr "puerto spamd"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "*Control*F1"
-msgstr ""
+msgstr "*Control*F1"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure las preferencias de correo incluyendo seguridad y visualización de "
 "mensajes, aquí"
@@ -14329,7 +14340,7 @@ msgstr "Control de preferencias de Evolution"
 msgid "Mail Accounts"
 msgstr "Cuentas de correo"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
@@ -14552,15 +14563,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Acuerdo de Licencia %s"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Usuario:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "R_uta:"
 
@@ -14588,68 +14599,68 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:465
 #, c-format
 msgid "%d junk"
 msgstr "%d spam"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d drafts"
 msgstr "%d borradores"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d sent"
 msgstr "%d enviar"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:492
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:496
 #, c-format
 msgid "%d total"
 msgstr "%d en total"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:498
 #, c-format
 msgid ", %d unread"
 msgstr ", %d no leídos"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:658
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:659
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:660
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:666
 msgid "New Mail Folder"
 msgstr "Nueva carpeta de correo"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:667
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:668
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:800
 msgid "Failed upgrading Mail settings or folders."
-msgstr ""
+msgstr "Fallo al actualizar la configuración de correo o carpetas."
 
 #: mail/mail-config.c:895
 msgid "Checking Service"
@@ -14659,7 +14670,7 @@ msgstr "Comprobando el servicio"
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identidad"
 
@@ -14674,7 +14685,7 @@ msgstr ""
 "información en el correo-e que envíe."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Recepción de correo"
 
@@ -14691,7 +14702,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Por favor selecciona entre las siguientes opciones"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Envío de correo"
 
@@ -14704,7 +14715,7 @@ msgstr ""
 "no está seguro, pregúntele a su administrador de sistemas o a su Proveedor "
 "de Servicios de Internet."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
@@ -14722,227 +14733,231 @@ msgstr ""
 "Por favor escriba un nombre para esta cuenta en el espacio de abajo. Este "
 "nombre sólo se usará para mostrar información."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Comprobar tipos soportados "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Vista previa</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL no está soportado en esta compilación de Evolution</b>"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>_Firmas</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Idiomas</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr "<small>Esto hará que el filtrado sea más exacto, pero más lento</small>"
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Información de la cuenta</span>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alertas</span>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tipo de autenticación</span>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autenticación</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">Comprobación de correo nuevo</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Redacción de mensajes</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuración</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Comportamiento predeterminado</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Borrar correo</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Cabeceras de correo _mostradas</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Opciones de filtros</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiquetas y colores</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Cargando imágenes</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Mensaje a mostrar</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Tipografías del mensaje</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Notificación de correo nuevo</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Información opcional</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opciones</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Tipografía para impresión</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Información requerida</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME seguro (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Seguridad</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Mensajes enviados y borradores</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuración del servidor</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_También cifrar a mí mismo cuando envíe correo cifrado"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Añadir firma _nueva..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "Añadir sc_ript"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 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:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Siempre mandar _copia de carbón (Cc) a:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Siempre mandar copia de carbón oc_ulta (Cco) a:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Firmar siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Siempre _confiar en las claves de mi anillo cuando cifre"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Adjuntar mensaje original"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "_Insertar emoticonos automáticamente"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "_Comprobar si hay correo nuevo automáticamente cada"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "Emitir un _pitido cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "Conjunto de carac_teres:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "_Comprobar tipos soportados "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Comprobar el correo _entrante"
+#: mail/mail-config.glade.h:55
+msgid "Check _incoming mail for junk"
+msgstr "Comprobar si el correo entrante es _spam"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Comprobar orto_grafía mientras se escribe"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Comprueba si el correo entrante es spam"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras _mal escritas:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Colores"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "_Confirmar antes de compactar una carpeta"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14958,239 +14973,242 @@ msgstr ""
 "\n"
 "Pulse «Finalizar» para guardar su configuración."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Predeterminada"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "_Codificación de caracteres predeterminada:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Predeterminados"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "No citar el mensaje original"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr ""
-"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
+msgstr "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Carpeta de _borradores:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Cuentas de correo"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "Dir_ección de correo:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "Vaciar _papelera al salir"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "Certificado de _cifrado:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "A_nchura fija:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Propiedades de tipografías"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Dar formato _HTML a los mensajes"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Correo en HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Cabeceras"
 
 # Esta cadena debe permanecer así
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Resaltar texto citado con este color:"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr "I_ncluir tests remotos"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Incluido en línea"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Localización del Mailbox"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Editor de mensajes"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Nota: No se le pedirá una contraseña hasta que conecte por primera vez"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "Reproducir un archivo de _sonido cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preguntar al mandar mensajes que tan sólo tengan definido el _Cco"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citar el mensaje original"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "_Recordar contraseña"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Opciones de recepción"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Recordar _contraseña"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "Tipografía _estándar:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Seguridad"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Seleccione..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Tipo de servidor: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "Certificado de _firma:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "_Firma:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Firmas"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Especificar nombre de a_rchivo:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Mailbox estándar de Unix"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "Tipografía del _terminal:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "_Tipo: "
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15200,7 +15218,7 @@ msgstr ""
 "firma. El nombre que especifique se usará\n"
 "únicamente para mostrarlo por pantalla. "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15210,7 +15228,7 @@ msgstr ""
 "y el idioma. La lista de idiomas de abajo refleja únicamente los idiomas "
 "para los cuales hay instalado un diccionario."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15218,15 +15236,11 @@ msgstr ""
 " Teclee el nombre por el que quiere identificar a esta cuenta.\n"
 " Por ejemplo: «Trabajo» o «Personal»"
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Usar _demonio"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "An_chura variable:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15236,88 +15250,84 @@ msgstr ""
 "\n"
 "Pulse «Adelante» para comenzar. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Añadir firma"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "_Siempre cargar las imágenes desde Internet"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Firmar _digitalmente los mensajes salientes (por omisión)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_No notificarme cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Cifrar mensajes salientes (por omisión)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Cargar imágenes si el remitente está en la libreta de direcciones"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "Pruebas _locales únicamente"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Hacer que ésta sea mi cuenta predeterminada"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leídos tras"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar imágenes desde Internet"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Preguntar al mandar mensajes en HTML a contactos que no los quieren"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al mandar mensajes con el asunto vacío"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Mo_strar imágenes animadas"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "U_sar conexión segura (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
 # Esta traducción debe mantenerse así
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr " "
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "descripción"
 
@@ -15342,12 +15352,11 @@ msgstr "Su inicio de sesión en su servidor «{0}» como «{0}» falló."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
-#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"Verifique que su contraseña está escrita corractamente. Recuerde que muchas "
+"Verifique que su contraseña está escrita correctamente. Recuerde que muchas "
 "contraseñas distinguen las mayúsculas, su tecla de bloqueo de mayúsculas "
 "puede estar activada."
 
@@ -15358,7 +15367,6 @@ msgstr "¿Seguro que quiere enviar un mensaje en formato HTML?"
 
 #. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
-#, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15366,7 +15374,9 @@ msgid ""
 "Send anyway?"
 msgstr ""
 "Por favor, asegúrese de que los siguientes destinatarios desean y son "
-"capaces de recibirmensajes formateados en HTML: ¿{0} Enviar de todas formas?"
+"capaces de recibir mensajes en HTML:\n"
+"{0}\n"
+"¿Enviar de todas formas?"
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
@@ -15388,13 +15398,13 @@ msgstr ""
 "destinatarios una idea de qué trata su correo."
 
 #. mail:ask-send-only-bcc-contact primary
+#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "¿Seguro que quiere enviar un mensaje con sólo destinatarios Cco?"
 
 #. mail:ask-send-only-bcc-contact secondary
 #: mail/mail-errors.xml.h:24
-#, fuzzy
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -15404,10 +15414,11 @@ msgid ""
 "recipient. "
 msgstr ""
 "La lista de contactos que está enviando está configurada para ocultar los "
-"destinatarios de la lista. Muchos sistemas de correo añaden una cabecera "
-"Apparentely-To a los mensajes que sólo tienen destinatarios Cco. Esta "
-"cabecera listará todos los destinatarios en su mensaje. Para evitar esto, "
-"debería añadir al menos un destinatario a Para: o Cc:"
+"destinatarios de la lista.\n"
+"Muchos sistemas de correo añaden una cabecera Apparentely-To a los "
+"mensajes que sólo tienen destinatarios Cco. Esta cabecera listará todos "
+"los destinatarios en su mensaje. Para evitar esto, debería añadir al "
+"menos un destinatario a Para: o Cc:"
 
 #. mail:ask-send-only-bcc secondary
 #: mail/mail-errors.xml.h:31
@@ -15424,10 +15435,8 @@ msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
-"El mensaje no puede ser enviado porque no ha especificado ningún destinatario"
+msgid "This message cannot be sent because you have not specified any Recipients"
+msgstr "El mensaje no puede ser enviado porque no ha especificado ningún destinatario"
 
 #. mail:send-no-recipients secondary
 #: mail/mail-errors.xml.h:36
@@ -15446,7 +15455,6 @@ msgstr "¿Quiere usar la carpeta de borradores predeterminada?"
 
 #. mail:ask-default-drafts secondary
 #: mail/mail-errors.xml.h:40
-#, fuzzy
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -15468,6 +15476,7 @@ msgstr ""
 "la carpeta «{0}»?"
 
 #. mail:ask-expunge secondary
+#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continua, no podrá recuperar estos mensajes."
@@ -15510,7 +15519,6 @@ msgstr "Su mensaje, con el asunto «{0}» no fue entregado."
 
 #. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
-#, fuzzy
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
 "reports the following error: status 67: mail not sent.\n"
@@ -15543,6 +15551,13 @@ msgid "{0}."
 msgstr "{0}."
 
 #. mail:session-message-info secondary
+#. mail:session-message-info-cancel secondary
+#. mail:session-message-warning secondary
+#. mail:session-message-warning-cancel secondary
+#. mail:session-message-error secondary
+#. mail:session-message-error-cancel secondary
+#. mail:ask-session-password secondary
+#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15571,6 +15586,8 @@ msgid "{1}"
 msgstr "{1}"
 
 #. mail:no-create-path primary
+#. mail:no-write-path-exists primary
+#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15587,6 +15604,9 @@ msgid "Cannot create temporary save directory."
 msgstr "No se pudo crear el directorio de guardado temporal."
 
 #. mail:no-create-tmp-path secondary
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
 #: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
 #: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
@@ -15613,6 +15633,7 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "No se pudo borrar la carpeta de sistema «{0}»."
 
 #. mail:no-delete-spethal-folder secondary
+#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15646,15 +15667,16 @@ msgstr ""
 "permanentemente."
 
 #. mail:no-rename-folder-exists primary
+#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "No se puede renombrar «{0}» a «{1}»."
 
 #. mail:no-rename-folder-exists secondary
+#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
+msgstr "Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
 
 #. mail:no-rename-folder secondary
 #: mail/mail-errors.xml.h:134
@@ -15662,21 +15684,25 @@ msgid "Because \"{2}\"."
 msgstr "Porque «{2}»"
 
 #. mail:no-move-folder-nostore primary
+#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "No se puede mover la carpeta «{0}» a «{1}»."
 
 #. mail:no-move-folder-nostore secondary
+#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "No se pudo abrir el origen «{2}»"
 
 #. mail:no-move-folder-to-nostore secondary
+#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "No se pudo abrir el destino «{2}»."
 
 #. mail:no-copy-folder-nostore primary
+#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "No se pudo copiar la carpeta: «{0}» a «{1}»."
@@ -15692,6 +15718,7 @@ msgid "Cannot open source \"{1}\""
 msgstr "No se pudo abrir el origen «{1}»"
 
 #. mail:account-incomplete primary
+#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "No se puede guardar los cambios en la cuenta."
@@ -15790,7 +15817,6 @@ msgstr "Carpetas virtuales automáticamente actualizadas."
 
 #. mail:vfolder-updated secondary
 #: mail/mail-errors.xml.h:196
-#, fuzzy
 msgid ""
 "The following vFolder(s):\n"
 "{0}\n"
@@ -15798,8 +15824,11 @@ msgid ""
 "    \"{1}\"\n"
 "And have been updated."
 msgstr ""
-"La(s) siguiente(s) carpeta(s) virtual(es): {0} Usaban la carpeta borrada: "
-"«{1}» y han sido actualizadas."
+"La(s) siguiente(s) carpeta(s) virtual(es):\n"
+"{0}\n"
+" Usaban la carpeta borrada:\n"
+"   «{1}» \n"
+"y han sido actualizadas."
 
 #. mail:filter-updated primary
 #: mail/mail-errors.xml.h:202
@@ -15808,7 +15837,6 @@ msgstr "Filtros de correo actualizados automáticamente."
 
 #. mail:filter-updated secondary
 #: mail/mail-errors.xml.h:204
-#, fuzzy
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15816,13 +15844,16 @@ msgid ""
 "    \"{1}\"\n"
 "And have been updated."
 msgstr ""
-"La(s) siguiente(s) reglas de filtros: {0} usaban la carpeta eliminada:{1}»Y "
-"han sido actualizadas."
+"La(s) siguiente(s) reglas de filtros:\n"
+"«{0}»\n"
+"usaban la carpeta eliminada:\n"
+"«{1}»\n"
+"Y han sido actualizadas."
 
 #. mail:ask-migrate-existing primary
 #: mail/mail-errors.xml.h:210
 msgid "Problem migrating old mail folder \"{0}\"."
-msgstr ""
+msgstr "Problema al migrar la carpeta antigua de correo «{0}»."
 
 #. mail:ask-migrate-existing secondary
 #: mail/mail-errors.xml.h:212
@@ -15832,43 +15863,41 @@ msgid ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit.\n"
 msgstr ""
+"Ya existe una carpeta no vacía en «{1}».\n"
+"\n"
+"Puede elegir ignorar esta carpeta, sobreescribirla o agregar su contenido, o salir.\n"
 
 #: mail/mail-errors.xml.h:216
 msgid "Ignore"
-msgstr ""
+msgstr "Ignorar"
 
 #: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
 #: mail/mail-errors.xml.h:218
-#, fuzzy
 msgid "_Append"
-msgstr "Aspen"
+msgstr "_Agregar"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:791
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Trabajando"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtrando carpeta"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falló al aplicar los filtros al correo saliente: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15877,115 +15906,115 @@ msgstr ""
 "Falló al anexar a %s: %s\n"
 "Anexando a la carpeta local «Correo enviado» en su lugar."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falló al anexar a la carpeta local «Correo enviado»: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Fallo al enviar %d de %d mensajes"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta «%s»"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta «%s»"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Compactando carpeta"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Descargando %d mensaje"
 msgstr[1] "Descargando %d mensajes"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15994,7 +16023,7 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16003,11 +16032,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16016,17 +16045,17 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
@@ -16090,24 +16119,24 @@ msgstr "Actualizando..."
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Operación cancelada por el usuario."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Recuerda esta contraseña"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recordar esta clave durante el resto de esta sesión"
 
@@ -16153,88 +16182,88 @@ msgid "Setting up vfolder: %s"
 msgstr "Configurando carpeta virtual: %s"
 
 #: mail/mail-vfolder.c:235
-#, fuzzy, c-format
+#, c-format
 msgid "Updating vFolders for '%s:%s'"
-msgstr "Actualizando carpetas virtuales para la URI: %s"
+msgstr "Actualizando carpetas virtuales para %s: %s"
 
 #: mail/mail-vfolder.c:242
-#, fuzzy, c-format
+#, c-format
 msgid "Updating vFolders for '%s'"
-msgstr "Actualizando carpetas virtuales para la URI: %s"
+msgstr "Actualizando carpetas virtuales para «%s»"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -16387,10 +16416,8 @@ msgstr ""
 "desarrollo de Evolution no se mostrará."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgstr "Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
@@ -16409,28 +16436,27 @@ msgid "Brought to you by"
 msgstr "Producido por"
 
 #: shell/e-shell.c:545 shell/e-shell.c:546
-#, fuzzy, c-format
+#, c-format
 msgid "%ld KB"
-msgstr "%d de %B"
+msgstr "%ld KiB"
 
-#: shell/e-shell.c:744
-#, fuzzy
+#: shell/e-shell.c:743
 msgid "Uknown system error."
-msgstr "Error desconocido"
+msgstr "Error de sistema desconocido."
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1100
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1102
 msgid "Cannot register on OAF"
 msgstr "No se pudo registrar en OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1104
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1106
 msgid "Generic error"
 msgstr "Error genérico"
 
@@ -16602,8 +16628,7 @@ msgstr "No ha especificado un nombre de carpeta."
 
 #: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
-msgstr ""
-"El nombre de la carpeta no puede contener el carácter de retorno de carro."
+msgstr "El nombre de la carpeta no puede contener el carácter de retorno de carro."
 
 #: shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
@@ -16618,33 +16643,29 @@ msgid "'.' and '..' are reserved folder names."
 msgstr "'.' y '..' son nombres reservados de carpetas."
 
 #: shell/e-shell-window.c:336
-#, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Ximian Evolution está conectado.  Pulse este botón para trabajar "
+"Evolution está conectado.  Pulse este botón para trabajar "
 "desconectado."
 
 #: shell/e-shell-window.c:343
-#, fuzzy
 msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution está en proceso de desconectarse."
+msgstr "Evolution está en proceso de desconectarse."
 
 #: shell/e-shell-window.c:349
-#, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Ximian Evolution está desconectado.  Pulse este botón para trabajar "
+"Evolution está desconectado.  Pulse este botón para trabajar "
 "conectado."
 
 #: shell/e-shell-window.c:621
-#, fuzzy, c-format
+#, c-format
 msgid "Switch to %s"
-msgstr "Enviar a %s"
+msgstr "Cambiar a %s"
 
 #: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
 #: shell/e-shell-window-commands.c:72
 #, c-format
@@ -16660,9 +16681,8 @@ msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug Buddy."
 
 #: shell/e-shell-window-commands.c:171
-#, fuzzy
 msgid "About Evolution"
-msgstr "Acerca de Ximian Evolution"
+msgstr "Acerca de Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
@@ -16684,43 +16704,6 @@ msgstr "Casilla de verificación"
 msgid "New"
 msgstr "Nuevo"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Error desconocido."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"El error del sistema de componentes es:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\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/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Prueba nueva"
@@ -16895,7 +16878,7 @@ msgstr "Evolution puede importar datos de los siguiente s archivos:"
 
 #. Preview/Alpha/Beta version warning message
 #: shell/main.c:231
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -16914,31 +16897,28 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 "Hola.  Gracias por tomarse el tiempo en descargar esta versión \n"
-"liberación preliminar de la suite para trabajo en grupo de Ximian, "
-"Evolution.\n"
+"liberación preliminar de la suite para trabajo en grupo Evolution.\n"
 "\n"
-"Esta versión de Ximian Evolution todavía no está terminada. Está cerca de "
-"terminarse\n"
-"pero algunas características están incompletas o no funcionan bien.\n"
+"Esta versión de Evolution todavía no está terminada. Está cerca de\n"
+"terminarse pero algunas características están incompletas o no\n"
+"funcionan como deben.\n"
 "\n"
-"Si quiere una versión estable de Evolution, es mejor que desinstale esta "
-"versión e instale la versión %s en su lugar.\n"
+"Si quiere una versión estable de Evolution, es mejor que desinstale\n"
+"esta versión e instale la versión %s en su lugar.\n"
 "\n"
 "Si encuentra fallos, por favor infórmenos de ellos en bugzilla.ximian.com.\n"
 "Este producto viene sin garantía alguna y no está dirigido a personas "
-"proclives a\n"
-"violentos accesos de ira.\n"
+"proclives a violentos accesos de ira.\n"
 "\n"
-"esperamos que disfrute de nuestro duro trabajo y esperamos su contribución.\n"
+"Esperamos que disfrute de nuestro duro trabajo y esperamos su contribución.\n"
 
 #: shell/main.c:255
-#, fuzzy
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 "Gracias\n"
-"El equipo de Ximian Evolution\n"
+"El equipo de Evolution\n"
 
 #: shell/main.c:262
 msgid "Don't tell me again"
@@ -16984,7 +16964,7 @@ msgstr ""
 #. shell:upgrade-nospace primary
 #: shell/shell-errors.xml.h:2
 msgid "Insufficient disk space for upgrade."
-msgstr ""
+msgstr "Espacio de disco insuficiente para la actualización."
 
 #. shell:upgrade-nospace secondary
 #: shell/shell-errors.xml.h:4
@@ -16995,6 +16975,10 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
+"La actualización de sus datos y configuración requerirá hasta  {0} de espacio de disco, "
+"pero sñolo tiene {1} disponibles.\n"
+"\n"
+"Necesitará hacer más espacio libre en su directorio personal antes de que pueda continuar."
 
 #. shell:upgrade-failed primary
 #: shell/shell-errors.xml.h:8
@@ -17002,6 +16986,8 @@ msgid ""
 "Upgrade from previous version failed:\n"
 "{0}"
 msgstr ""
+"La actualización desde la versión anterior ha fallado:\n"
+"{0}"
 
 #. shell:upgrade-failed secondary
 #: shell/shell-errors.xml.h:11
@@ -17011,23 +16997,25 @@ msgid ""
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 msgstr ""
+"{1}\n"
+"\n"
+"Si elige continuar, quizá no tenga acceso a algunos de sus datos antiguos.\n"
 
 #: shell/shell-errors.xml.h:15
-#, fuzzy
 msgid "Continue"
-msgstr "Constantine"
+msgstr "Continuar"
 
 #. shell:noshell title
+#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
-#, fuzzy
 msgid "Cannot start Evolution"
-msgstr "No se pudo registrar la shell de Ximian Evolution."
+msgstr "No se pudo iniciar Evolution."
 
 #. shell:noshell primary
+#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
-#, fuzzy
 msgid "Evolution can not start."
-msgstr "Asistente de cuentas de Evolution"
+msgstr "Evolution no pudo iniciar."
 
 #. shell:noshell secondary
 #: shell/shell-errors.xml.h:21
@@ -17036,6 +17024,9 @@ msgid ""
 "\n"
 "Click help for details"
 msgstr ""
+"Su configuración del sistema no coincide con su configuración de Evolution.\n"
+"\n"
+"Pulse en ayuda para más detalles"
 
 #. shell:noshell-reason secondary
 #: shell/shell-errors.xml.h:29
@@ -17046,11 +17037,16 @@ msgid ""
 "\n"
 "Click help for details."
 msgstr ""
+"La configuración de su sistema no coincide con su configuración de Evolution:\n"
+"\n"
+"{0}\n"
+"\n"
+"Pulse en la ayuda para los detalles."
 
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
-msgstr "Seleccionar un certificado para importar..."
+msgstr "Seleccione un certificado para importar..."
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
 #: smime/gui/certificate-manager.c:604
@@ -17112,6 +17108,10 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+msgid "Select certificate"
+msgstr "Seleccione el certificado"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<No es parte del certificado>"
@@ -17270,8 +17270,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
 #: smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Tiene archivados los certificados que identifican a estas autoridades de "
 "certificación:"
@@ -17475,7 +17474,7 @@ msgid "Certificate Signature Value"
 msgstr "Valor de la firma del certificado"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "El certificado ya existe"
 
@@ -17637,9 +17636,8 @@ msgid "_Preview Pane"
 msgstr "Panel de vista _previa"
 
 #: ui/evolution-addressbook.xml.h:41
-#, fuzzy
 msgid "_Save as VCard..."
-msgstr "G_uardar como vCard"
+msgstr "G_uardar como vCard..."
 
 #: ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
@@ -17966,8 +17964,7 @@ msgstr "Abre una ventana para escribir un mensaje de correo"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
@@ -18026,10 +18023,8 @@ msgid "Hide _Read Messages"
 msgstr "Oculta_r mensajes leídos"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+msgid "Hide deleted messages rather than displaying them with a line through them"
+msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
@@ -18344,9 +18339,8 @@ msgid "Open the selected message in a new window"
 msgstr "Abre el mensaje seleccionado en una nueva ventana"
 
 #: ui/evolution-mail-message.xml.h:71
-#, fuzzy
 msgid "Open the selected message in the composer for editing"
-msgstr "Abre el mensaje seleccionado para reenviarlo"
+msgstr "Abre el mensaje seleccionado en el editor para editarlo"
 
 #: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
@@ -18897,9 +18891,8 @@ msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
 #: ui/evolution.xml.h:36
-#, fuzzy
 msgid "_Window"
-msgstr "_Ventana nueva"
+msgstr "_Ventana"
 
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -18966,7 +18959,7 @@ msgid "With _Status"
 msgstr "Con _estado"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19120,29 +19113,28 @@ msgstr "Otro..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
 msgstr "Advertencia de Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 msgid "Evolution Information"
 msgstr "Información de Evolution"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 msgid "Evolution Query"
 msgstr "Consulta de Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr ""
 "<span weight=\"bold\">Error interno, solicitado un error desconocido «%s»</"
 "span>"
@@ -19280,12 +19272,12 @@ msgstr "No se pudo guardar el archivo {0}."
 msgid "Cannot open file \"{0}\"."
 msgstr "No se pudo abrir el archivo «{0}»."
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
@@ -19299,6 +19291,12 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Visor de carpetas de la libreta de direcciones de Evolution"
 
+#~ msgid "Job title:"
+#~ msgstr "Puesto:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "No se pudo encontrar el widget para el campo: «%s»"
+
 #~ msgid "Could not initialize gnome-vfs"
 #~ msgstr "No se pudo inicializar gnome-vfs"
 
@@ -19332,6 +19330,9 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Could not load the tasks in `%s'"
 #~ msgstr "No se pudo cargar las tareas en «%s»"
 
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "Aprendizaje de mensaje(s) de spam/no spam"
+
 #~ msgid ""
 #~ "The folder name \"%s\" is invalid because it containes the character \"%c"
 #~ "\""
@@ -19344,6 +19345,10 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Failed to migrate folder expand state: %s"
 #~ msgstr "Falló  al migrar el estado de expansión de la carpeta : %s"
 
+#, fuzzy
+#~ msgid "Failed to create directory `%s': %s"
+#~ msgstr "Falló al crear pipe a «%s»: %s"
+
 #~ msgid "Failed to open store for `%s': %s"
 #~ msgstr "Fallo al abrir almacén para «%s»: %s"
 
@@ -19353,6 +19358,22 @@ msgstr "%s (%d%% completado)"
 #~ msgid "URI of the mail source that the view will display"
 #~ msgstr "URI de la fuente de correo que la vista mostrará"
 
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Comprobar el correo _entrante"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Usar _demonio"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "Pruebas _locales únicamente"
+
+#~ msgid "Working"
+#~ msgstr "Trabajando"
+
+#, fuzzy
+#~ msgid "Updating vfolders for uri: %s"
+#~ msgstr "Actualizando carpetas virtuales para la URI: %s"
+
 #~ msgid ""
 #~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
 #~ "d.\n"
@@ -19364,6 +19385,45 @@ msgstr "%s (%d%% completado)"
 #~ "Los datos no se han borrado, pero no se verán con esta versión de "
 #~ "Evolution.\n"
 
+#, fuzzy
+#~ msgid "About Ximian Evolution"
+#~ msgstr "Acerca de Ximian Evolution..."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Error desconocido."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "El error del sistema de componentes es:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "El error del sistema de activación es:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Cannot register the Ximian Evolution shell."
+#~ msgstr "No se pudo inicializar la shell de Ximian Evolution: %s"
+
 #~ msgid "Cannot initialize the Ximian Evolution shell: %s"
 #~ msgstr "No se pudo inicializar la shell de Ximian Evolution: %s"
 
@@ -19373,6 +19433,12 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Because \"{1}\""
 #~ msgstr "Porque «{1}»"
 
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Las siguientes conexiones están actualmente activas:"
+
 #~ msgid "Address 2:"
 #~ msgstr "Dirección 2:"
 
@@ -20285,9 +20351,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Failed on message %d of %d"
 #~ msgstr "Error en mensaje %d de %d"
 
-#~ msgid "Changing junk status"
-#~ msgstr "Cambiar el estado de spam"
-
 #~ msgid "Quit Assistant"
 #~ msgstr "Salir del asistente"
 
@@ -30478,3 +30541,4 @@ msgstr "%s (%d%% completado)"
 
 #~ msgid "th"
 #~ msgstr "º"
+
author	Francisco Javier F. Serrador <serrador@cvs.gnome.org>	2004-05-23 04:35:07 +0800
committer	Francisco Javier Fernandez Serrador <serrador@src.gnome.org>	2004-05-23 04:35:07 +0800
commit	f3f19a97d77a28380183dab7eb0d842887289be4 (patch)
tree	40b136b57482c641bf16242ab49b3422476d70a0 /po/es.po
parent	b84fb23be76e50e45d9e0b9c611dc5b516af52ee (diff)
download	gsoc2013-evolution-f3f19a97d77a28380183dab7eb0d842887289be4.tar.gz gsoc2013-evolution-f3f19a97d77a28380183dab7eb0d842887289be4.tar.zst gsoc2013-evolution-f3f19a97d77a28380183dab7eb0d842887289be4.zip